Implemented a new docker compose structure which seperates between docker compose files and environment variable file to protect credentials better. Also did recatoring. Changes not fully tested

roles/docker-yourls/tasks/main.yml

@@ -6,8 +6,16 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: add docker-compose.yml
-  template: 
-    src:  "docker-compose.yml.j2" 
-    dest: "{{docker_compose.directories.instance}}docker-compose.yml"
+- name: "create {{docker_compose.files.docker_compose}}"
+  template:
+    src:	"docker-compose.yml.j2"
+    dest:	"{{docker_compose.files.docker_compose}}"
+  notify: docker compose project setup
+
+- name: "create {{docker_compose.files.env}}"
+  template: 
+    src:  "env.j2" 
+    dest: "{{docker_compose.files.env}}"
+    mode: '770'
+    force: yes
   notify: docker compose project setup

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

@@ -3,20 +3,10 @@ services:
 {% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
 
   application:
-    logging:
-      driver: journald
     image: yourls:{{applications.yourls.version}}
-    restart: {{docker_restart_policy}}
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     ports:
       - "127.0.0.1:{{http_port}}:80"
-    environment:
-      YOURLS_DB_HOST: "{{database_host}}"
-      YOURLS_DB_USER: "{{database_username}}"
-      YOURLS_DB_PASS: "{{database_password}}"
-      YOURLS_DB_NAME: "{{database_name}}"
-      YOURLS_SITE:    "https://{{domain}}"
-      YOURLS_USER:    "{{applications.yourls.administrator_username}}"
-      YOURLS_PASS:    "{{yourls_administrator_password}}"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1/admin/"]
       interval: 1m

roles/docker-yourls/templates/env.j2

@@ -0,0 +1,7 @@
+YOURLS_DB_HOST: "{{database_host}}"
+YOURLS_DB_USER: "{{database_username}}"
+YOURLS_DB_PASS: "{{database_password}}"
+YOURLS_DB_NAME: "{{database_name}}"
+YOURLS_SITE:    "https://{{domain}}"
+YOURLS_USER:    "{{applications.yourls.administrator_username}}"
+YOURLS_PASS:    "{{yourls_administrator_password}}"