From 7420ed60105dbcf5b5c76c90279c4c8b3889bd98 Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Tue, 18 Feb 2025 05:43:39 +0100
Subject: [PATCH] nginx(role): split up repo setup and install task lists to
 estab. conv.

Split up repo setup and package installation after all to establish this
as a convention (its already done this way in the docker role and was
done this way in the nginx role before) to highlight that an external
repo is used.
---
 playbooks/maintenance.yaml                            | 11 ++++++++---
 roles/nginx/tasks/main.yaml                           |  8 ++++++--
 .../{02_nginx_install.yaml => 02_repo_setup.yaml}     |  7 -------
 roles/nginx/tasks/main/03_nginx_install.yaml          |  6 ++++++
 .../{03_config_deploy.yaml => 04_config_deploy.yaml}  |  0
 5 files changed, 20 insertions(+), 12 deletions(-)
 rename roles/nginx/tasks/main/{02_nginx_install.yaml => 02_repo_setup.yaml} (90%)
 create mode 100644 roles/nginx/tasks/main/03_nginx_install.yaml
 rename roles/nginx/tasks/main/{03_config_deploy.yaml => 04_config_deploy.yaml} (100%)

diff --git a/playbooks/maintenance.yaml b/playbooks/maintenance.yaml
index 8b6d037..40ca666 100644
--- a/playbooks/maintenance.yaml
+++ b/playbooks/maintenance.yaml
@@ -1,10 +1,15 @@
-- name: Ensure nginx install on nginx_hosts and nextcloud_hosts
+- name: Ensure NGINX repo setup and nginx install on nginx_hosts and nextcloud_hosts
   hosts: nginx_hosts:nextcloud_hosts
   tasks:
-    - name: Ensure NGINX is installed
+    - name: Ensure NGINX repo is setup
       ansible.builtin.include_role:
         name: nginx
-        tasks_from: main/02_nginx_install.yaml
+        tasks_from: main/02_repo_setup.yaml
+
+    - name: Ensure nginx is installed
+      ansible.builtin.include_role:
+        name: nginx
+        tasks_from: main/03_nginx_install.yaml
 
 - name: Make Sure System Package Are Up-To-Date for all non-hypervisors
   hosts: all:!hypervisors
diff --git a/roles/nginx/tasks/main.yaml b/roles/nginx/tasks/main.yaml
index 4a86530..0cade0b 100644
--- a/roles/nginx/tasks/main.yaml
+++ b/roles/nginx/tasks/main.yaml
@@ -2,10 +2,14 @@
   ansible.builtin.import_tasks:
     file: main/01_validate_config_names.yaml
 
+- name: Ensure NGINX repo is set up
+  ansible.builtin.import_tasks:
+    file: main/02_repo_setup.yaml
+
 - name: Ensure nginx is installed
   ansible.builtin.import_tasks:
-    file: main/02_nginx_install.yaml
+    file: main/03_nginx_install.yaml
 
 - name: Ensure configuration deployment
   ansible.builtin.import_tasks:
-    file: main/03_config_deploy.yaml
+    file: main/04_config_deploy.yaml
diff --git a/roles/nginx/tasks/main/02_nginx_install.yaml b/roles/nginx/tasks/main/02_repo_setup.yaml
similarity index 90%
rename from roles/nginx/tasks/main/02_nginx_install.yaml
rename to roles/nginx/tasks/main/02_repo_setup.yaml
index 9ceb323..eaaec30 100644
--- a/roles/nginx/tasks/main/02_nginx_install.yaml
+++ b/roles/nginx/tasks/main/02_repo_setup.yaml
@@ -37,10 +37,3 @@
     group: root
     mode: "0644"
   become: true
-
-- name: Ensure nginx is installed
-  ansible.builtin.apt:
-    name: nginx
-    state: present
-    update_cache: true
-  become: true
diff --git a/roles/nginx/tasks/main/03_nginx_install.yaml b/roles/nginx/tasks/main/03_nginx_install.yaml
new file mode 100644
index 0000000..86df2e1
--- /dev/null
+++ b/roles/nginx/tasks/main/03_nginx_install.yaml
@@ -0,0 +1,6 @@
+- name: Ensure nginx is installed
+  ansible.builtin.apt:
+    name: nginx
+    state: present
+    update_cache: true
+  become: true
diff --git a/roles/nginx/tasks/main/03_config_deploy.yaml b/roles/nginx/tasks/main/04_config_deploy.yaml
similarity index 100%
rename from roles/nginx/tasks/main/03_config_deploy.yaml
rename to roles/nginx/tasks/main/04_config_deploy.yaml