From 051e4accd69381d7d087b5e7516cbba93270b571 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Thu, 7 Aug 2025 12:59:54 +0200
Subject: [PATCH] Activated redirect for yourls homepage to admin pannel

---
 roles/web-app-yourls/config/main.yml          |  4 +++-
 .../templates/docker-compose.yml.j2           |  2 +-
 .../web-app-yourls/templates/redirect.conf.j2 |  3 +++
 roles/web-app-yourls/vars/main.yml            | 21 ++++++++++++-------
 4 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 roles/web-app-yourls/templates/redirect.conf.j2

diff --git a/roles/web-app-yourls/config/main.yml b/roles/web-app-yourls/config/main.yml
index bae353cb..bf5984c4 100644
--- a/roles/web-app-yourls/config/main.yml
+++ b/roles/web-app-yourls/config/main.yml
@@ -5,7 +5,7 @@ oauth2_proxy:
     - "/roles/web-app-yourls-administrator"
   acl:
     blacklist:
-      - "/admin/"     # Protects the admin area
+      - "<< defaults_applications[web-app-yourls].server.locations.admin >>" # Protects the admin area
 features:
   matomo:             true
   css:                true
@@ -27,6 +27,8 @@ server:
         unsafe-inline:  true
       script-src:
         unsafe-inline:  true
+  locations:
+    admin:  "/admin/"
 docker:
   services:
     database:
diff --git a/roles/web-app-yourls/templates/docker-compose.yml.j2 b/roles/web-app-yourls/templates/docker-compose.yml.j2
index 00041ba6..62ba7086 100644
--- a/roles/web-app-yourls/templates/docker-compose.yml.j2
+++ b/roles/web-app-yourls/templates/docker-compose.yml.j2
@@ -2,7 +2,7 @@
 
   application:
 {% set container_port = 80 %}
-{% set container_healthcheck = 'http://127.0.0.1/admin/' %}
+{% set container_healthcheck = 'http://127.0.0.1' ~ yourls_admin_location %}
     image: "{{ yourls_image }}:{{ yourls_version }}"
     container_name: "{{ yourls_container }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
diff --git a/roles/web-app-yourls/templates/redirect.conf.j2 b/roles/web-app-yourls/templates/redirect.conf.j2
new file mode 100644
index 00000000..28687e05
--- /dev/null
+++ b/roles/web-app-yourls/templates/redirect.conf.j2
@@ -0,0 +1,3 @@
+location = / {
+    return 301 {{ yourls_admin_location }};
+}
\ No newline at end of file
diff --git a/roles/web-app-yourls/vars/main.yml b/roles/web-app-yourls/vars/main.yml
index 4a15fddf..bc50b04e 100644
--- a/roles/web-app-yourls/vars/main.yml
+++ b/roles/web-app-yourls/vars/main.yml
@@ -1,7 +1,14 @@
-application_id:   "web-app-yourls"
-database_type:    "mariadb"
-yourls_user:      "{{ applications | get_app_conf(application_id, 'users.administrator.username', True) }}"
-yourls_password:  "{{ applications | get_app_conf(application_id, 'credentials.administrator_password', True) }}"
-yourls_version:   "{{ applications | get_app_conf(application_id, 'docker.services.yourls.version', True) }}"
-yourls_image:     "{{ applications | get_app_conf(application_id, 'docker.services.yourls.image', True) }}"
-yourls_container:      "{{ applications | get_app_conf(application_id, 'docker.services.yourls.name', True) }}"
\ No newline at end of file
+# General
+application_id:             "web-app-yourls"
+database_type:              "mariadb"
+
+# Yourls Specific
+yourls_user:                "{{ applications | get_app_conf(application_id, 'users.administrator.username', True) }}"
+yourls_password:            "{{ applications | get_app_conf(application_id, 'credentials.administrator_password', True) }}"
+yourls_version:             "{{ applications | get_app_conf(application_id, 'docker.services.yourls.version', True) }}"
+yourls_image:               "{{ applications | get_app_conf(application_id, 'docker.services.yourls.image', True) }}"
+yourls_container:           "{{ applications | get_app_conf(application_id, 'docker.services.yourls.name', True) }}"
+yourls_admin_location:      "{{ applications | get_app_conf(application_id, 'server.locations.admin', True) }}"
+
+# Nginx Specific
+proxy_extra_configuration:  "{{ lookup('template', 'redirect.conf.j2') }}"