Changed yourls to yourls and additional optimations

roles/web-app-yourls/config/main.yml

@@ -1,16 +1,15 @@
-version:              "latest"
 oauth2_proxy:  
   application:        "application"
   port:               "80"
   allowed_groups:
-    - "yourls-administrator"
+    - "web-app-yourls-administrator"
   acl:
     blacklist:
       - "/admin/"     # Protects the admin area
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:   true
+  port-ui-desktop:    true
   central_database:   true
   oauth2:             true
 domains:
@@ -21,4 +20,8 @@ domains:
 docker:
   services:
     database:
-      enabled: true
+      enabled: true
+    yourls: 
+      version:    "latest"
+      name:       "yourls" 
+      image:      "yourls"

roles/web-app-yourls/templates/docker-compose.yml.j2

@@ -3,7 +3,8 @@
   application:
 {% set container_port = 80 %}
 {% set container_healthcheck = 'http://127.0.0.1/admin/' %}
-    image: yourls:{{applications.yourls.version}}
+    image: "{{ yourls_image }}:{{ yourls_version }}"
+    container_name: "{{ yourls_container }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"

roles/web-app-yourls/templates/env.j2

@@ -1,9 +1,9 @@
-YOURLS_DB_HOST: "{{database_host}}"
-YOURLS_DB_USER: "{{database_username}}"
-YOURLS_DB_PASS: "{{database_password}}"
-YOURLS_DB_NAME: "{{database_name}}"
+YOURLS_DB_HOST: "{{ database_host }}"
+YOURLS_DB_USER: "{{ database_username }}"
+YOURLS_DB_PASS: "{{ database_password }}"
+YOURLS_DB_NAME: "{{ database_name }}"
 YOURLS_SITE:    "{{ domains | get_url(application_id, web_protocol) }}"
-YOURLS_USER:    "{{applications.yourls.users.administrator.username}}"
-YOURLS_PASS:    "{{applications | get_app_conf(application_id, 'credentials.administrator_password', True)}}"
+YOURLS_USER:    "{{ yourls_user }}"
+YOURLS_PASS:    "{{ yourls_password }}"
 # The following deactivates the login mask for admins, if the oauth2 proxy is activated 
 YOURLS_PRIVATE: "{{not (applications | get_app_conf(application_id, 'features.oauth2', False))}}" 

roles/web-app-yourls/vars/main.yml

@@ -1,2 +1,7 @@
-application_id: "yourls"
-database_type:  "mariadb"
+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_name:      "{{ applications | get_app_conf(application_id, 'docker.services.yourls.name', True) }}"