From 80957e4ac78f7d40de120d452f7e3a9c5e977166 Mon Sep 17 00:00:00 2001
From: Kacper Donat <kadet1090@gmail.com>
Date: Fri, 28 Oct 2022 22:32:16 +0200
Subject: [PATCH] Allow reusing service templates

---
 tasks/deploy.yml  |  6 +++---
 vars/services.yml | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index f63a1b4..ebc20b5 100644
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -1,7 +1,7 @@
 ---
 - name: 'Include vars for "{{ service }}" service'
   include_vars: "{{ service_vars_file }}"
-  with_fileglob: "{{ services_root }}/{{ service }}/vars/*"
+  with_fileglob: "{{ service_path }}/vars/*"
   loop_control:
     loop_var: service_vars_file
   tags:
@@ -28,7 +28,7 @@
 
 - name: 'Load configuration tasks for "{{ service }}"'
   include_tasks: "{{ service_task_file }}"
-  with_fileglob: "{{ services_root }}/{{ service }}/tasks/*"
+  with_fileglob: "{{ service_path }}/tasks/*"
   loop_control:
     loop_var: service_task_file
   when: service_task_file|basename is not regex('^_')
@@ -37,7 +37,7 @@
 
 - name: 'Copy stack file of "{{ service }}" to remote server'
   template:
-    src: "{{ services_root }}/{{ service }}/stack.yml"
+    src: "{{ service_path }}/stack.yml"
     dest: "{{ remote_service_path }}/stack.yml"
   tags:
     - deploy
diff --git a/vars/services.yml b/vars/services.yml
index 0128268..78e0f92 100644
--- a/vars/services.yml
+++ b/vars/services.yml
@@ -1,8 +1,9 @@
 ---
 services_root: "{{ './services' | realpath }}"
-service_path: "{{ services_root }}/{{ service }}"
+service_template: "{{ service_config[service].template | default(service) }}"
+service_path: "{{ services_root }}/{{ service_template }}"
 
-services: "{{ lookup('pipe', 'ls -1 ' + services_root).split('\n') | list }}"
+services: "{{ service_config | keys | list }}"
 
 remote_services_root: /var/services
 remote_service_path: "{{ remote_services_root }}/{{ service }}"
@@ -109,13 +110,11 @@ service_config:
       name: cojedzie
       user: cojedzie
       password: "{{ mysql_user_passwords['cojedzie'] }}"
-
   cojedzie-next: 
     cojedzie_database:
       name: cojedzie-next
       user: cojedzie-next
       password: "{{ mysql_user_passwords['cojedzie-next'] }}"
-
   registry:
     registry_users:
       - "{{ swarm_registry_user }}"
@@ -165,6 +164,7 @@ service_config:
         region: eu-central-003
         regionendpoint: https://s3.eu-central-003.backblazeb2.com
         bucket: kadet-docker
-
+  portainer: ~
+  system: ~
 www_data_users:
   - vagrant