diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2023-09-05 17:39:35 +0200 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2023-09-05 17:39:35 +0200 |
| commit | 478c9abe89de1686828d34b8ef3baa336cc88af6 (patch) | |
| tree | 7aae71adf0b12180862b7e080ab6c06db6999ba9 | |
| parent | 67bb8e203161da8aaa5660b194569f0584f14cfa (diff) | |
| download | playbooks-ansible-478c9abe89de1686828d34b8ef3baa336cc88af6.tar.gz playbooks-ansible-478c9abe89de1686828d34b8ef3baa336cc88af6.tar.xz playbooks-ansible-478c9abe89de1686828d34b8ef3baa336cc88af6.zip | |
Move systemd-im to common role
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | roles/common/files/status-im-root@.service (renamed from roles/diagnostics/files/status-im-root@.service) | 0 | ||||
| -rw-r--r-- | roles/common/tasks/main.yml | 7 | ||||
| -rw-r--r-- | roles/common/tasks/xmppc.yml (renamed from roles/diagnostics/tasks/xmppc.yml) | 0 | ||||
| -rw-r--r-- | roles/common/templates/skels_xmppc.conf.j2 (renamed from roles/diagnostics/templates/skels_xmppc.conf.j2) | 0 | ||||
| -rwxr-xr-x | roles/common/templates/systemd-im.sh.j2 (renamed from roles/diagnostics/templates/systemd-im.sh.j2) | 0 | ||||
| -rw-r--r-- | roles/common/templates/xmppc.conf.j2 (renamed from roles/diagnostics/templates/xmppc.conf.j2) | 0 | ||||
| -rw-r--r-- | roles/diagnostics/tasks/main.yml | 7 |
8 files changed, 8 insertions, 8 deletions
@@ -4,8 +4,8 @@ host_vars/merlin.home.casperlefantom.net/secrets.yml host_vars/ns2.casperlefantom.net/secrets.yml host_vars/ns4.casperlefantom.net/secrets.yml host_vars/ns5.casperlefantom.net/secrets.yml +roles/common/vars/credentials.yml roles/diagnostics/files/aidedb-hash -roles/diagnostics/vars/credentials.yml roles/bittorrent/files/stats roles/dnsserver/vars/keys.yml roles/dnsserver/files/dnssec diff --git a/roles/diagnostics/files/status-im-root@.service b/roles/common/files/status-im-root@.service index 039b1b1..039b1b1 100644 --- a/roles/diagnostics/files/status-im-root@.service +++ b/roles/common/files/status-im-root@.service diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 555ed05..534b190 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,3 +1,7 @@ +- name: Loading hidden variables + include_vars: credentials.yml + tags: keys + - name: Install playbook dependancies import_tasks: deps.yml @@ -48,3 +52,6 @@ - name: Configuration de Docker import_tasks: docker.yml + +- name: Messages pour systemd + import_tasks: xmppc.yml diff --git a/roles/diagnostics/tasks/xmppc.yml b/roles/common/tasks/xmppc.yml index fa99166..fa99166 100644 --- a/roles/diagnostics/tasks/xmppc.yml +++ b/roles/common/tasks/xmppc.yml diff --git a/roles/diagnostics/templates/skels_xmppc.conf.j2 b/roles/common/templates/skels_xmppc.conf.j2 index a78940d..a78940d 100644 --- a/roles/diagnostics/templates/skels_xmppc.conf.j2 +++ b/roles/common/templates/skels_xmppc.conf.j2 diff --git a/roles/diagnostics/templates/systemd-im.sh.j2 b/roles/common/templates/systemd-im.sh.j2 index bdd64d8..bdd64d8 100755 --- a/roles/diagnostics/templates/systemd-im.sh.j2 +++ b/roles/common/templates/systemd-im.sh.j2 diff --git a/roles/diagnostics/templates/xmppc.conf.j2 b/roles/common/templates/xmppc.conf.j2 index 8011744..8011744 100644 --- a/roles/diagnostics/templates/xmppc.conf.j2 +++ b/roles/common/templates/xmppc.conf.j2 diff --git a/roles/diagnostics/tasks/main.yml b/roles/diagnostics/tasks/main.yml index 89a0e5f..c28629b 100644 --- a/roles/diagnostics/tasks/main.yml +++ b/roles/diagnostics/tasks/main.yml @@ -1,7 +1,3 @@ -- name: Loading hidden variables - include_vars: credentials.yml - tags: keys - - name: Configuration démon Cron import_tasks: cron.yml @@ -20,9 +16,6 @@ - name: Bot de diagnostique jabber import_tasks: pysysbot.yml -- name: Messages pour systemd - import_tasks: xmppc.yml - - name: État des services import_tasks: services.yml |