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-pixelfed/tasks/main.yml

@@ -6,14 +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: add env
+- name: "create {{docker_compose.files.env}}"
   template: 
-    src: env.j2
-    dest: "{{docker_compose.directories.instance}}env"
+    src:  "env.j2" 
+    dest: "{{docker_compose.files.env}}"
     mode: '770'
     force: yes
   notify: docker compose project setup

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

@@ -6,11 +6,7 @@ services:
 
   application:
     image: zknt/pixelfed:{{applications.pixelfed.version}}
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
-    env_file:
-      - ./env
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     volumes:
       - "data:/var/www/storage"
       - "./env:/var/www/.env"
@@ -20,11 +16,7 @@ services:
 {% include 'templates/docker/container/networks.yml.j2' %}
   worker:
     image: zknt/pixelfed:{{applications.pixelfed.version}}
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
-    env_file:
-      - ./env
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     volumes:
       - "data:/var/www/storage"
       - "./env:/var/www/.env"