Refactored docker rroles dto use new role docker-compose

roles/docker-pixelfed/handlers/main.yml

@@ -1,8 +0,0 @@
----
-- name: recreate pixelfed
-  command:
-    cmd: docker-compose -p pixelfed up -d --force-recreate
-    chdir: "{{path_docker_compose_instances}}pixelfed/"
-  environment:
-    COMPOSE_HTTP_TIMEOUT: 600
-    DOCKER_CLIENT_TIMEOUT: 600

roles/docker-pixelfed/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- nginx-docker-reverse-proxy
+- docker-compose

roles/docker-pixelfed/tasks/main.yml

@@ -10,7 +10,7 @@
 
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml
-  notify: recreate pixelfed
+  notify: docker compose project setup
 
 - name: add env
   template: 
@@ -18,4 +18,4 @@
     dest: "{{docker_compose_instance_directory}}env"
     mode: '770'
     force: yes
-  notify: recreate pixelfed
+  notify: docker compose project setup

roles/docker-pixelfed/vars/main.yml

@@ -1,7 +1,7 @@
-docker_compose_instance_directory: "{{path_docker_compose_instances}}pixelfed/"
+docker_compose_project_name:                    "pixelfed"
+docker_compose_instance_directory:              "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
 nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 512M;"
-database_instance:  "pixelfed"
-database_host:      "database"
-database_databasename:  "{{database_instance}}"
-database_username:  "{{database_instance}}"
-database_password:  "{{pixelfed_database_password}}"
+database_host:                                  "database"
+database_databasename:                          "{{docker_compose_project_name}}"
+database_username:                              "{{docker_compose_project_name}}"
+database_password:                              "{{pixelfed_database_password}}"