From e9ec01a4ff1c1a3683eb4b10d5522dfa806fa743 Mon Sep 17 00:00:00 2001 From: VC Date: Fri, 5 Jul 2024 11:53:22 +0200 Subject: [PATCH] feat: adapt scootaloo config to multi env --- roles/webapps/tasks/main.yml | 3 +++ roles/webapps/tasks/scootaloo.yml | 8 -------- roles/webapps/tasks/scootaloo_config.yml | 9 +++++++++ 3 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 roles/webapps/tasks/scootaloo_config.yml diff --git a/roles/webapps/tasks/main.yml b/roles/webapps/tasks/main.yml index c279354..7208623 100644 --- a/roles/webapps/tasks/main.yml +++ b/roles/webapps/tasks/main.yml @@ -14,6 +14,9 @@ when: inventory_hostname == 'web2.dmz.mateu.be' - name: Scootaloo for Mastodon include_tasks: scootaloo.yml + when: inventory_hostname in groups['rorservers'] +- name: Scootaloo config for m.nintendojo.fr + include_tasks: scootaloo_config.yml when: inventory_hostname == 'ror1.dmz.mateu.be' - name: tootctl for mastodon include_tasks: tootctl.yml diff --git a/roles/webapps/tasks/scootaloo.yml b/roles/webapps/tasks/scootaloo.yml index 116a538..552c403 100644 --- a/roles/webapps/tasks/scootaloo.yml +++ b/roles/webapps/tasks/scootaloo.yml @@ -8,14 +8,6 @@ group: www-data mode: 0750 -- name: put configuration file - template: - src: scootaloo.toml.j2 - dest: /usr/local/etc/scootaloo.toml - owner: root - group: www-data - mode: 0640 - - name: create scootaloo config dir file: path: "{{ scootaloo_db_path }}" diff --git a/roles/webapps/tasks/scootaloo_config.yml b/roles/webapps/tasks/scootaloo_config.yml new file mode 100644 index 0000000..7fdb87d --- /dev/null +++ b/roles/webapps/tasks/scootaloo_config.yml @@ -0,0 +1,9 @@ +--- + +- name: put configuration file + template: + src: scootaloo.toml.j2 + dest: /usr/local/etc/scootaloo.toml + owner: root + group: www-data + mode: 0640