From 0e45294efa60f0b4aeaaefda4dcdfc9770206bcb Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Sun, 26 May 2024 21:20:50 +0200
Subject: [PATCH] Refactored taiga

---
 roles/docker-taiga/tasks/main.yml             |  4 --
 .../templates/docker-compose-inits.yml.j2     |  4 +-
 .../templates/docker-compose.yml.j2           | 42 +++++++++----------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/roles/docker-taiga/tasks/main.yml b/roles/docker-taiga/tasks/main.yml
index 13e105da..3961c332 100644
--- a/roles/docker-taiga/tasks/main.yml
+++ b/roles/docker-taiga/tasks/main.yml
@@ -12,7 +12,3 @@
       - .env
       - docker-compose.yml
       - docker-compose-init.yml
-
-- name: configure run.env
-  template: src=env.j2 dest={{docker_compose_instance_directory}}/.env
-  notify: docker compose project setup
diff --git a/roles/docker-taiga/templates/docker-compose-inits.yml.j2 b/roles/docker-taiga/templates/docker-compose-inits.yml.j2
index 9faf7634..27ee9bf9 100644
--- a/roles/docker-taiga/templates/docker-compose-inits.yml.j2
+++ b/roles/docker-taiga/templates/docker-compose-inits.yml.j2
@@ -26,8 +26,8 @@ x-environment:
 
 x-volumes:
   &default-back-volumes
-  - taiga-static-data:/taiga-back/static
-  - taiga-media-data:/taiga-back/media
+  - static-data:/taiga-back/static
+  - media-data:/taiga-back/media
   # - ./config.py:/taiga-back/settings/config.py
 
 services:
diff --git a/roles/docker-taiga/templates/docker-compose.yml.j2 b/roles/docker-taiga/templates/docker-compose.yml.j2
index 06309494..13d2b26f 100644
--- a/roles/docker-taiga/templates/docker-compose.yml.j2
+++ b/roles/docker-taiga/templates/docker-compose.yml.j2
@@ -33,13 +33,13 @@ x-environment:
 x-volumes:
   &default-back-volumes
   # These volumens will be used by taiga-back and taiga-async.
-  - taiga-static-data:/taiga-back/static
-  - taiga-media-data:/taiga-back/media
+  - static-data:/taiga-back/static
+  - media-data:/taiga-back/media
   # - ./config.py:/taiga-back/settings/config.py
 
 services:
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}
-  taiga-back:
+  back:
     image: taigaio/taiga-back:latest
     environment: *default-back-environment
     volumes: *default-back-volumes
@@ -48,7 +48,7 @@ services:
       taiga:
 
 {% include 'templates/docker/container/depends-on-also-database.yml.j2' %}
-      taiga-events-rabbitmq:
+      events-rabbitmq:
         condition: service_started
       taiga-async-rabbitmq:
         condition: service_started
@@ -63,7 +63,7 @@ services:
       taiga:
 
 {% include 'templates/docker/container/depends-on-also-database.yml.j2' %}
-      taiga-events-rabbitmq:
+      events-rabbitmq:
         condition: service_started
       taiga-async-rabbitmq:
         condition: service_started
@@ -77,12 +77,12 @@ services:
       RABBITMQ_DEFAULT_VHOST: "${RABBITMQ_VHOST}"
     hostname: "taiga-async-rabbitmq"
     volumes:
-      - taiga-async-rabbitmq-data:/var/lib/rabbitmq
+      - async-rabbitmq-data:/var/lib/rabbitmq
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
 
-  taiga-front:
+  front:
     image: taigaio/taiga-front:latest
     environment:
       TAIGA_URL: "${TAIGA_SCHEME}://${TAIGA_DOMAIN}"
@@ -95,7 +95,7 @@ services:
     # volumes:
     #   - ./conf.json:/usr/share/nginx/html/conf.json
 
-  taiga-events:
+  events:
     image: taigaio/taiga-events:latest
     environment:
       RABBITMQ_USER: "${RABBITMQ_USER}"
@@ -105,19 +105,19 @@ services:
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
     depends_on:
-      taiga-events-rabbitmq:
+      events-rabbitmq:
         condition: service_started
 
-  taiga-events-rabbitmq:
+  events-rabbitmq:
     image: rabbitmq:3.8-management-alpine
     environment:
       RABBITMQ_ERLANG_COOKIE: "${RABBITMQ_ERLANG_COOKIE}"
       RABBITMQ_DEFAULT_USER: "${RABBITMQ_USER}"
       RABBITMQ_DEFAULT_PASS: "${RABBITMQ_PASS}"
       RABBITMQ_DEFAULT_VHOST: "${RABBITMQ_VHOST}"
-    hostname: "taiga-events-rabbitmq"
+    hostname: "events-rabbitmq"
     volumes:
-      - taiga-events-rabbitmq-data:/var/lib/rabbitmq
+      - events-rabbitmq-data:/var/lib/rabbitmq
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -137,21 +137,21 @@ services:
       - "9000:80"
     volumes:
       - ./taiga-gateway/taiga.conf:/etc/nginx/conf.d/default.conf
-      - taiga-static-data:/taiga/static
-      - taiga-media-data:/taiga/media
+      - static-data:/taiga/static
+      - media-data:/taiga/media
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
     depends_on:
-      - taiga-front
-      - taiga-back
-      - taiga-events
+      - front
+      - back
+      - events
 
 {% include 'templates/docker/compose/volumes.yml.j2' %}
-  taiga-static-data:
-  taiga-media-data:
-  taiga-async-rabbitmq-data:
-  taiga-events-rabbitmq-data:
+  static-data:
+  media-data:
+  async-rabbitmq-data:
+  events-rabbitmq-data:
 
 {% include 'templates/docker/compose/networks.yml.j2' %}
   taiga:
\ No newline at end of file