From 2206c2b67af59c7afe94dc4f74dd17c723e46f4d Mon Sep 17 00:00:00 2001
From: Alexandre Pires <c.alexandre.pires@gmail.com>
Date: Sun, 29 Sep 2024 00:16:51 +0200
Subject: [PATCH] Refactor systemd unit files for mounting and opening LUKS
 devices

---
 ansible/playbook_encryption.yml |  9 ++++++---
 ansible/playbook_gitea.yml      | 13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ansible/playbook_encryption.yml b/ansible/playbook_encryption.yml
index 1203c45..7cdbcae 100644
--- a/ansible/playbook_encryption.yml
+++ b/ansible/playbook_encryption.yml
@@ -93,6 +93,7 @@
           [Unit]
           Description=Open LUKS device
           After=network-online.target
+          Before=snap.microk8s.daemon-kubelite.service
 
           [Service]
           Type=oneshot
@@ -103,7 +104,7 @@
           ExecStop=/usr/sbin/cryptsetup close {{ luks_device_name }}
 
           [Install]
-          WantedBy=remote-fs.target
+          WantedBy=snap.microk8s.daemon-kubelite.service
 
     - name: Create systemd service to mount the file system
       ansible.builtin.copy:
@@ -112,7 +113,9 @@
         content: |
           [Unit]
           Description=Mount LUKS device
-          After=remote-fs.target
+          After={{ key_fetch_service }}
+          Requires={{ key_fetch_service }}
+          Before=snap.microk8s.daemon-kubelite.service
 
           [Mount]
           What=/dev/mapper/{{ luks_device_name }}
@@ -121,7 +124,7 @@
           Options=defaults
 
           [Install]
-          WantedBy=multi-user.target
+          WantedBy=snap.microk8s.daemon-kubelite.service
 
     - name: Reload systemd daemon
       ansible.builtin.systemd:
diff --git a/ansible/playbook_gitea.yml b/ansible/playbook_gitea.yml
index 478c84a..c1e5fa9 100644
--- a/ansible/playbook_gitea.yml
+++ b/ansible/playbook_gitea.yml
@@ -8,6 +8,7 @@
     - name: Set required facts
       ansible.builtin.set_fact:
         gitea_home: "/var/lib/gitea"
+        gitea_config_dir: "/a13labs/gitea"
         gitea_mysql_home: "/var/lib/mysql.gitea"
         gitea_user_id: 1000
         gitea_group_id: 1000
@@ -57,6 +58,18 @@
         - tasks
         - tasks::folders
 
+    - name: Create required gitea config folder
+      become: true
+      ansible.builtin.file:
+        state: directory
+        path: "{{ gitea_config_dir }}"
+        mode: "0750"
+        owner: "{{ gitea_user_id }}"
+        group: "{{ gitea_group_id }}"
+      tags:
+        - tasks
+        - tasks::folders
+
     - name: Create required mysql data folder
       become: true
       ansible.builtin.file: