From 4acf51bedf512100bac3bf0702e724b7374828cf Mon Sep 17 00:00:00 2001 From: Rens van Moorsel Date: Tue, 30 Sep 2025 13:12:48 +0200 Subject: [PATCH 1/2] fix: correct folder, user group and alternative_names for committeeclash and rottenspringbok --- ansible/group_vars/all/websites.yml | 1 + ansible/roles/committeeclash/tasks/main.yml | 2 ++ ansible/roles/committeeclash/vars/main.yml | 2 +- ansible/roles/rottenspringbok/tasks/main.yml | 2 ++ ansible/roles/rottenspringbok/vars/main.yml | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/all/websites.yml b/ansible/group_vars/all/websites.yml index 7a135620..3ceccbe9 100644 --- a/ansible/group_vars/all/websites.yml +++ b/ansible/group_vars/all/websites.yml @@ -261,4 +261,5 @@ websites: - name: "rottenspringbok.{{ canonical_hostname }}" user: "rotten_springbok" custom_config: true + alternative_names: [] state: "present" diff --git a/ansible/roles/committeeclash/tasks/main.yml b/ansible/roles/committeeclash/tasks/main.yml index 6f9869d7..7d1fa13e 100644 --- a/ansible/roles/committeeclash/tasks/main.yml +++ b/ansible/roles/committeeclash/tasks/main.yml @@ -6,6 +6,8 @@ shell: "/usr/sbin/nologin" state: "present" system: true + groups: "docker" + append: true - name: "set up committeeclash" become_user: "committeeclash" diff --git a/ansible/roles/committeeclash/vars/main.yml b/ansible/roles/committeeclash/vars/main.yml index 1aebb94e..63ee6b6a 100644 --- a/ansible/roles/committeeclash/vars/main.yml +++ b/ansible/roles/committeeclash/vars/main.yml @@ -1,4 +1,4 @@ --- committeeclash_port: 4569 committeeclash_docs_port: 4571 -committeeclash_project_source: /home/committeeclash +committeeclash_project_source: /vars/www/committeeclash diff --git a/ansible/roles/rottenspringbok/tasks/main.yml b/ansible/roles/rottenspringbok/tasks/main.yml index 70cc6fd5..36639929 100644 --- a/ansible/roles/rottenspringbok/tasks/main.yml +++ b/ansible/roles/rottenspringbok/tasks/main.yml @@ -6,6 +6,8 @@ shell: "/usr/sbin/nologin" state: "present" system: true + groups: "docker" + append: true - name: "set up rottenspringbok" become_user: "rottenspringbok" diff --git a/ansible/roles/rottenspringbok/vars/main.yml b/ansible/roles/rottenspringbok/vars/main.yml index 1d9b6b09..d63700de 100644 --- a/ansible/roles/rottenspringbok/vars/main.yml +++ b/ansible/roles/rottenspringbok/vars/main.yml @@ -1,3 +1,3 @@ --- rottenspringbok_port: 4572 -rottenspringbok_project_source: /home/rotten_springbok +rottenspringbok_project_source: /var/www/rotten_springbok From c5e7c0679a00aa3f2e8b7827b672f617227a0208 Mon Sep 17 00:00:00 2001 From: Rens van Moorsel Date: Tue, 30 Sep 2025 13:16:15 +0200 Subject: [PATCH 2/2] fix: change vars to var --- ansible/roles/committeeclash/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/committeeclash/vars/main.yml b/ansible/roles/committeeclash/vars/main.yml index 63ee6b6a..86c45ede 100644 --- a/ansible/roles/committeeclash/vars/main.yml +++ b/ansible/roles/committeeclash/vars/main.yml @@ -1,4 +1,4 @@ --- committeeclash_port: 4569 committeeclash_docs_port: 4571 -committeeclash_project_source: /vars/www/committeeclash +committeeclash_project_source: /var/www/committeeclash