From fc6e485a6145684ba58baff5a3621397f5dd156c Mon Sep 17 00:00:00 2001
From: Yuri Tatishchev <itatishch@gmail.com>
Date: Wed, 30 Oct 2024 18:11:26 -0700
Subject: [PATCH] refactor: separate templating for j2 and normal files

---
 roles/alpina/tasks/deploy_compose_stack.yml    | 18 +++++++++++++-----
 .../{.env.notify_push => .env.notify_push.j2}  |  0
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename roles/alpina/templates/apps/nextcloud/{.env.notify_push => .env.notify_push.j2} (100%)

diff --git a/roles/alpina/tasks/deploy_compose_stack.yml b/roles/alpina/tasks/deploy_compose_stack.yml
index c6cbde2..074798f 100644
--- a/roles/alpina/tasks/deploy_compose_stack.yml
+++ b/roles/alpina/tasks/deploy_compose_stack.yml
@@ -10,7 +10,7 @@
   file:
     path: "{{ current_stack_dest }}/{{ item.path }}"
     state: directory
-    mode: "700"
+    mode: "755"
   loop: "{{ lookup('community.general.filetree', current_stack_source) }}"
   when: item.state == "directory"
 
@@ -18,9 +18,17 @@
   template:
     src: "{{ item.src }}"
     dest: "{{ current_stack_dest }}/{{ item.path | regex_replace('\\.j2$', '') }}"
-    mode: "600"
+    mode: "644"
   loop: "{{ lookup('community.general.filetree', current_stack_source) }}"
-  when: item.state == "file"
+  when: item.state == "file" and item.path | regex_search('\\.j2$')
+
+- name: Generate {{ current_stack_name }} deployment from static files
+  copy:
+    src: "{{ item.src }}"
+    dest: "{{ current_stack_dest }}/{{ item.path }}"
+    mode: "644"
+  loop: "{{ lookup('community.general.filetree', current_stack_source) }}"
+  when: item.state == "file" and not item.path | regex_search('\\.j2$')
 
 - name: Deploy docker-compose for {{ current_stack_name }}
   community.docker.docker_compose_v2:
@@ -30,5 +38,5 @@
     remove_orphans: yes
   register: docker_compose_output
 
-- debug:
-    var: docker_compose_output
+# - debug:
+#     var: docker_compose_output
diff --git a/roles/alpina/templates/apps/nextcloud/.env.notify_push b/roles/alpina/templates/apps/nextcloud/.env.notify_push.j2
similarity index 100%
rename from roles/alpina/templates/apps/nextcloud/.env.notify_push
rename to roles/alpina/templates/apps/nextcloud/.env.notify_push.j2