diff --git a/roles/alertmanager/tasks/main.yml b/roles/alertmanager/tasks/main.yml index 3337c171947c646a13bdbb0b3c639ae74bfbc3b0..87e4177154d52039703521f868bda097d6c22e11 100644 --- a/roles/alertmanager/tasks/main.yml +++ b/roles/alertmanager/tasks/main.yml @@ -6,4 +6,4 @@ notify: Reload alertmanager - name: Enable alertmanager server service - systemd: name=alertmanager enabled=yes daemon_reload=yes state=started + systemd_service: name=alertmanager enabled=yes daemon_reload=yes state=started diff --git a/roles/arch_boxes_sync/tasks/main.yml b/roles/arch_boxes_sync/tasks/main.yml index 4d6491387ecd1cb311582d6e455fdfee11e86576..d5656c25c938132c5623e81b41ab08ee6a7506c6 100644 --- a/roles/arch_boxes_sync/tasks/main.yml +++ b/roles/arch_boxes_sync/tasks/main.yml @@ -13,4 +13,4 @@ - Daemon reload - name: Start and enable arch-boxes-sync.timer - systemd: name=arch-boxes-sync.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=arch-boxes-sync.timer enabled=yes daemon_reload=yes state=started diff --git a/roles/archbuild/handlers/main.yml b/roles/archbuild/handlers/main.yml index 53c25acb653061ac6585331c532338b68ce70faa..71c5a8270d8399cd2d01a9fa009728993b7b91dd 100644 --- a/roles/archbuild/handlers/main.yml +++ b/roles/archbuild/handlers/main.yml @@ -1,3 +1,3 @@ - name: Daemon reload - systemd: + systemd_service: daemon-reload: true diff --git a/roles/archive/tasks/main.yml b/roles/archive/tasks/main.yml index ff4823150a7698736f98c736cf72459b0d6a1d5d..1e5dc4b52864c28660ba8b4b28f27d05fb3f7b78 100644 --- a/roles/archive/tasks/main.yml +++ b/roles/archive/tasks/main.yml @@ -18,10 +18,10 @@ mode: '0644' - name: Setup archive timer - systemd: name=archive.timer enabled=yes state=started + systemd_service: name=archive.timer enabled=yes state=started - name: Setup archive-hardlink timer - systemd: name=archive-hardlink.timer enabled=yes state=started + systemd_service: name=archive-hardlink.timer enabled=yes state=started - name: Install internet archive packages pacman: name=python-internetarchive,python-libarchive-c state=present @@ -45,7 +45,7 @@ - archive-uploader.timer - name: Start uploader timer - systemd: + systemd_service: name: archive-uploader.timer enabled: true state: started diff --git a/roles/archmanweb/tasks/main.yml b/roles/archmanweb/tasks/main.yml index 603cc3ad5de7d7068e540859ec269d9cf50273c1..ed4f458f71dab571eb4818bc80ab47c65739574d 100644 --- a/roles/archmanweb/tasks/main.yml +++ b/roles/archmanweb/tasks/main.yml @@ -103,4 +103,4 @@ - archmanweb_update.timer - name: Start and enable archmanweb update timer - systemd: name="archmanweb_update.timer" enabled=yes state=started daemon_reload=yes + systemd_service: name="archmanweb_update.timer" enabled=yes state=started daemon_reload=yes diff --git a/roles/archweb/handlers/main.yml b/roles/archweb/handlers/main.yml index 481889db08ff215815b64c0436907688d6bb9073..be925b61614bccfc369f37ae4bdcc7898d86dc26 100644 --- a/roles/archweb/handlers/main.yml +++ b/roles/archweb/handlers/main.yml @@ -1,5 +1,5 @@ - name: Daemon reload - systemd: + systemd_service: daemon-reload: true - name: Restart archweb memcached diff --git a/roles/archweb/tasks/main.yml b/roles/archweb/tasks/main.yml index a8c22d24c74c9c13ce78067de6503371c862e505..324cc653036293bfc8762029a72c9a42e3ac060b 100644 --- a/roles/archweb/tasks/main.yml +++ b/roles/archweb/tasks/main.yml @@ -242,7 +242,7 @@ notify: Restart archweb memcached - name: Start and enable archweb memcached service and archweb-rsync_iso timer - systemd: + systemd_service: name: "{{ item }}" enabled: true state: started diff --git a/roles/archwiki/tasks/main.yml b/roles/archwiki/tasks/main.yml index 160c8235187a73990bb93c98e33549814333e2eb..e4087fc3a0a1cee1bc96cd153d0e62acfe3af5d1 100644 --- a/roles/archwiki/tasks/main.yml +++ b/roles/archwiki/tasks/main.yml @@ -95,7 +95,7 @@ template: src="memcached.service.d-archwiki.conf.j2" dest="/etc/systemd/system/memcached@archwiki.service.d/archwiki.conf" owner=root group=root mode=0644 - name: Start and enable memcached service - systemd: name=memcached@archwiki.service state=started enabled=true daemon_reload=true + systemd_service: name=memcached@archwiki.service state=started enabled=true daemon_reload=true - name: Install nginx-cache-purge script copy: src=nginx-cache-purge dest=/usr/local/bin/nginx-cache-purge owner=root group=root mode=0755 @@ -111,7 +111,7 @@ - nginx-cache-purge.service - name: Start and enable archwiki timers and services - systemd: + systemd_service: name: "{{ item }}" enabled: true state: started @@ -123,7 +123,7 @@ - nginx-cache-purge.service - name: Create question answer file - systemd: + systemd_service: name: archwiki-question-updater.service state: started daemon_reload: true diff --git a/roles/aurweb/handlers/main.yml b/roles/aurweb/handlers/main.yml index 59206cdecf28c53399ed0e606f2312eda1d998da..e640ca2e16ed9d11515fbd8e35e3d70b9fa07499 100644 --- a/roles/aurweb/handlers/main.yml +++ b/roles/aurweb/handlers/main.yml @@ -1,5 +1,5 @@ - name: Daemon reload - systemd: + systemd_service: daemon-reload: true - name: Restart sshd diff --git a/roles/aurweb/tasks/main.yml b/roles/aurweb/tasks/main.yml index 0b57fab62b8086aa55c89e9aaa5e35737264c6a9..599bcaba2f443bc9b47aa81d8b11635bb028a5a2 100644 --- a/roles/aurweb/tasks/main.yml +++ b/roles/aurweb/tasks/main.yml @@ -289,7 +289,7 @@ - Restart sshd - name: Start and enable AUR systemd services and timers - systemd: name={{ item.name }} enabled=yes state=started daemon_reload=yes + systemd_service: name={{ item.name }} enabled=yes state=started daemon_reload=yes with_items: - "{{ aurweb_services }}" - "{{ aurweb_timers }}" diff --git a/roles/borg_client/tasks/main.yml b/roles/borg_client/tasks/main.yml index d0848d5a47e80082597626390475ce194e33dd1e..c2aedef24cd73a8fb94f51a2809db90c0a19e24a 100644 --- a/roles/borg_client/tasks/main.yml +++ b/roles/borg_client/tasks/main.yml @@ -56,4 +56,4 @@ - borg-backup-offsite.service - name: Activate systemd timer for backup - systemd: name=borg-backup.timer enabled=yes state=started daemon-reload=yes + systemd_service: name=borg-backup.timer enabled=yes state=started daemon-reload=yes diff --git a/roles/bugbot/tasks/main.yml b/roles/bugbot/tasks/main.yml index b58782da8ef06eeae213d3282ddccb3a976ae1db..ed88a5ab1c35d61bca6a21f51b3b5df5c2082d15 100644 --- a/roles/bugbot/tasks/main.yml +++ b/roles/bugbot/tasks/main.yml @@ -23,4 +23,4 @@ copy: src=bugbot.service dest=/etc/systemd/system/bugbot.service owner=root group=root mode=0644 - name: Start and enable bugbot service - systemd: name=bugbot.service enabled=yes state=started daemon_reload=yes + systemd_service: name=bugbot.service enabled=yes state=started daemon_reload=yes diff --git a/roles/bugbuddy/handlers/main.yml b/roles/bugbuddy/handlers/main.yml index 53c25acb653061ac6585331c532338b68ce70faa..71c5a8270d8399cd2d01a9fa009728993b7b91dd 100644 --- a/roles/bugbuddy/handlers/main.yml +++ b/roles/bugbuddy/handlers/main.yml @@ -1,3 +1,3 @@ - name: Daemon reload - systemd: + systemd_service: daemon-reload: true diff --git a/roles/bugbuddy/tasks/main.yml b/roles/bugbuddy/tasks/main.yml index 3dbd5a83393f1bea4f2477fabaa0685fd772e5ba..9bbd082f73ea0decc108601f1375b2d8e8f33698 100644 --- a/roles/bugbuddy/tasks/main.yml +++ b/roles/bugbuddy/tasks/main.yml @@ -16,7 +16,7 @@ command: /usr/local/bin/bugbuddy-download --restart - name: Start and enable daemon service - systemd: name=bugbuddy.service enabled=yes state=started + systemd_service: name=bugbuddy.service enabled=yes state=started - name: Open bugbuddy ipv4 port for gitlab.archlinux.org ansible.posix.firewalld: zone=wireguard state=enabled permanent=true immediate=yes diff --git a/roles/certbot/tasks/main.yml b/roles/certbot/tasks/main.yml index 2edbcd52bbf90239e887e5f24a7f0d2f8eda2122..aebc2092dfb7c2f60e35e88675462e1e81ef17e3 100644 --- a/roles/certbot/tasks/main.yml +++ b/roles/certbot/tasks/main.yml @@ -18,7 +18,7 @@ - certbot-renewal.timer - name: Activate letsencrypt renewal service - systemd: + systemd_service: name: certbot-renewal.timer enabled: true state: started diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml index de2412cc7f18d7e87a16e833ab1e1af110e49631..17a0161d31e9e0691835e75919d25c77f78b22fe 100644 --- a/roles/common/handlers/main.yml +++ b/roles/common/handlers/main.yml @@ -1,12 +1,12 @@ - name: Restart journald - systemd: + systemd_service: name: systemd-journald state: restarted daemon_reload: true - name: Systemd daemon-reload - systemd: + systemd_service: daemon_reload: true - name: Restart systemd-zram-setup@zram0 - systemd: name=systemd-zram-setup@zram0 state=restarted daemon_reload=yes + systemd_service: name=systemd-zram-setup@zram0 state=restarted daemon_reload=yes diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index b6676bbb82ba6abce3e18501fbef3361c3064274..2927b76e68c1a1436ba1ea87191a8ac68a2e01e0 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -160,4 +160,4 @@ copy: src=paccache.service dest=/etc/systemd/system/paccache.service owner=root group=root mode=0644 - name: Enable paccache timer - systemd: name=paccache.timer enabled=yes state=started daemon_reload=yes + systemd_service: name=paccache.timer enabled=yes state=started daemon_reload=yes diff --git a/roles/dbscripts/tasks/main.yml b/roles/dbscripts/tasks/main.yml index 1837d5a8343832e1800d0b641cf3dadc9b04db28..e368d44555ba3ed02d2981e57753f799da033bb3 100644 --- a/roles/dbscripts/tasks/main.yml +++ b/roles/dbscripts/tasks/main.yml @@ -11,7 +11,7 @@ pacman: name=fcgiwrap state=present - name: Install fcgiwrap for the Git repo - systemd: name=fcgiwrap.socket enabled=yes state=started + systemd_service: name=fcgiwrap.socket enabled=yes state=started - name: Allow state repo to be exported file: path="/srv/repos/state/.git/git-daemon-export-ok" state=touch owner=git-packages group=junior-packager mode=0644 diff --git a/roles/dovecot/tasks/main.yml b/roles/dovecot/tasks/main.yml index 6c27a9073e60470aad1c17da1d44128eafb16b5d..d412e88262995495511561dcc9c1cde3c05e5edf 100644 --- a/roles/dovecot/tasks/main.yml +++ b/roles/dovecot/tasks/main.yml @@ -72,7 +72,7 @@ - dovecot-cleanup.service - name: Activate systemd timers - systemd: + systemd_service: name: "{{ item }}" state: started enabled: true diff --git a/roles/dyn_dns/tasks/main.yml b/roles/dyn_dns/tasks/main.yml index f2d24c3b113d40cc8743b361532ed60c55cd579e..a6aa734c95d495ccca9fe8964be392a5a99515c5 100644 --- a/roles/dyn_dns/tasks/main.yml +++ b/roles/dyn_dns/tasks/main.yml @@ -44,4 +44,4 @@ ansible.posix.firewalld: service=dns permanent=true state=enabled immediate=yes - name: Start and enable powerdns - systemd: name=pdns.service enabled=yes daemon_reload=yes state=started + systemd_service: name=pdns.service enabled=yes daemon_reload=yes state=started diff --git a/roles/fail2ban/handlers/main.yml b/roles/fail2ban/handlers/main.yml index a83c6320ae11eaadc61ca0f0ff3fa77472e5a05d..23a94fdb474cdd48a7df1e74ae715bac31ffa7ee 100644 --- a/roles/fail2ban/handlers/main.yml +++ b/roles/fail2ban/handlers/main.yml @@ -1,5 +1,5 @@ - name: Restart fail2ban - systemd: + systemd_service: name: fail2ban state: restarted diff --git a/roles/fail2ban/tasks/main.yml b/roles/fail2ban/tasks/main.yml index 92559dc23670e5333ace19b16b95a5f2ffb4a71f..cf0593aa992b7ae728765563c96cd98f16f92669 100644 --- a/roles/fail2ban/tasks/main.yml +++ b/roles/fail2ban/tasks/main.yml @@ -93,14 +93,14 @@ register: result - name: Restart firewalld - systemd: name=firewalld state=restarted + systemd_service: name=firewalld state=restarted when: result.changed - name: Add fail2ban ipset to the firewalld drop zone ansible.posix.firewalld: source=ipset:fail2ban zone=drop permanent=true immediate=true state=enabled - name: Start and enable service - systemd: + systemd_service: name: "fail2ban.service" enabled: true state: started diff --git a/roles/fluxbb/handlers/main.yml b/roles/fluxbb/handlers/main.yml index f26cb90057db58d6d06c93dd705d02f488f9b9fc..238bc809dbaa50495930457c21b1a667031d9dba 100644 --- a/roles/fluxbb/handlers/main.yml +++ b/roles/fluxbb/handlers/main.yml @@ -1,2 +1,2 @@ - name: Restart php-fpm@fluxbb - systemd: name=php-fpm@fluxbb.service state=restarted + systemd_service: name=php-fpm@fluxbb.service state=restarted diff --git a/roles/geo_dns/tasks/main.yml b/roles/geo_dns/tasks/main.yml index 5c3bcc39c23aa2cda369bcc096b8530dff43eecb..c284379a1ea8158c8d3f85b2d1c844209b328af4 100644 --- a/roles/geo_dns/tasks/main.yml +++ b/roles/geo_dns/tasks/main.yml @@ -24,4 +24,4 @@ ansible.posix.firewalld: service=dns permanent=true state=enabled immediate=yes - name: Start and enable powerdns - systemd: name=pdns.service enabled=yes daemon_reload=yes state=started + systemd_service: name=pdns.service enabled=yes daemon_reload=yes state=started diff --git a/roles/geoipupdate/tasks/main.yml b/roles/geoipupdate/tasks/main.yml index 597d1f78175e43496ae713728d9d0e3f64fe2ec3..7e21091e269bfc7dbca0115b6733557286b1bbfe 100644 --- a/roles/geoipupdate/tasks/main.yml +++ b/roles/geoipupdate/tasks/main.yml @@ -7,8 +7,8 @@ register: configuration - name: Run geoipupdate after installation or configuration change - systemd: name=geoipupdate state=restarted + systemd_service: name=geoipupdate state=restarted when: installation is changed or configuration is changed - name: Start and enable geoipupdate.timer - systemd: name=geoipupdate.timer enabled=yes state=started + systemd_service: name=geoipupdate.timer enabled=yes state=started diff --git a/roles/gitlab/tasks/main.yml b/roles/gitlab/tasks/main.yml index 935ea31c8ca407ab6ca522ed0d6463f8e5a32b43..dc1dac55aab6b01bf913585570c10a76f7b427ae 100644 --- a/roles/gitlab/tasks/main.yml +++ b/roles/gitlab/tasks/main.yml @@ -140,7 +140,7 @@ - gitlab-bot-token-extender.service - name: Activate systemd timers for gitlab-cleanup - systemd: name={{ item }} enabled=yes state=started daemon-reload=yes + systemd_service: name={{ item }} enabled=yes state=started daemon-reload=yes loop: - gitlab-cleanup.timer - gitlab-bot-token-extender.timer diff --git a/roles/gitlab_runner/handlers/main.yml b/roles/gitlab_runner/handlers/main.yml index 833593337d9f596bf9d9a97f660ea0ed9c862a5b..d9b812c4d76a04aa0bc59f7a6b0a7836768756bc 100644 --- a/roles/gitlab_runner/handlers/main.yml +++ b/roles/gitlab_runner/handlers/main.yml @@ -1,11 +1,11 @@ - name: Systemd daemon-reload - systemd: daemon_reload=yes + systemd_service: daemon_reload=yes - name: Restart gitlab-runner service: name=gitlab-runner state=restarted - name: Restart gitlab-runner-docker-cleanup.timer - systemd: name=gitlab-runner-docker-cleanup.timer state=restarted daemon_reload=yes + systemd_service: name=gitlab-runner-docker-cleanup.timer state=restarted daemon_reload=yes - name: Restart docker service: name=docker state=restarted diff --git a/roles/gitlab_runner/tasks/main.yml b/roles/gitlab_runner/tasks/main.yml index 60e468c84fa90fbeea032ba6acbd97bbd1fe2540..4cff32972ee52de8667ff40b5c588bea557a8de9 100644 --- a/roles/gitlab_runner/tasks/main.yml +++ b/roles/gitlab_runner/tasks/main.yml @@ -7,7 +7,7 @@ notify: Systemd daemon-reload - name: Start docker - systemd: name=docker enabled=yes state=started daemon_reload=yes + systemd_service: name=docker enabled=yes state=started daemon_reload=yes - name: Create /etc/docker directory file: state=directory owner=root group=root mode=0755 path=/etc/docker @@ -58,10 +58,10 @@ - Restart gitlab-runner-docker-cleanup.timer - name: Enable and start gitlab-runner-docker-cleanup.timer - systemd: name=gitlab-runner-docker-cleanup.timer state=started enabled=yes daemon_reload=yes + systemd_service: name=gitlab-runner-docker-cleanup.timer state=started enabled=yes daemon_reload=yes - name: Enable and start gitlab runner service - systemd: name=gitlab-runner state=started enabled=yes daemon_reload=yes + systemd_service: name=gitlab-runner state=started enabled=yes daemon_reload=yes - name: Setup libvirt-executor when: "'gitlab_vm_runners' in group_names" @@ -89,4 +89,4 @@ - libvirt-executor-fetch-image.timer - name: Enable and start libvirt-executor-fetch-image.timer - systemd: name=libvirt-executor-fetch-image.timer state=started enabled=yes daemon_reload=yes + systemd_service: name=libvirt-executor-fetch-image.timer state=started enabled=yes daemon_reload=yes diff --git a/roles/gluebuddy/handlers/main.yml b/roles/gluebuddy/handlers/main.yml index 53c25acb653061ac6585331c532338b68ce70faa..71c5a8270d8399cd2d01a9fa009728993b7b91dd 100644 --- a/roles/gluebuddy/handlers/main.yml +++ b/roles/gluebuddy/handlers/main.yml @@ -1,3 +1,3 @@ - name: Daemon reload - systemd: + systemd_service: daemon-reload: true diff --git a/roles/gluebuddy/tasks/main.yml b/roles/gluebuddy/tasks/main.yml index 4197f77f9f5f7cd1c342ca14c902f1f974ed80cf..fa856632c0ee321233f92e9bc0c365e63d377928 100644 --- a/roles/gluebuddy/tasks/main.yml +++ b/roles/gluebuddy/tasks/main.yml @@ -19,4 +19,4 @@ command: /usr/local/bin/gluebuddy_download.sh - name: Enable timer - systemd: name=gluebuddy.timer enabled=yes state=started + systemd_service: name=gluebuddy.timer enabled=yes state=started diff --git a/roles/keycloak/handlers/main.yml b/roles/keycloak/handlers/main.yml index b3e6fcce7eb4fd17cbd586f172566b6e27a7168e..4716737caaa3227edcff5c1465887b20e4a55e9b 100644 --- a/roles/keycloak/handlers/main.yml +++ b/roles/keycloak/handlers/main.yml @@ -2,5 +2,5 @@ service: name=keycloak state=restarted - name: Daemon reload - systemd: + systemd_service: daemon-reload: true diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml index 9e5251f05d7f98adfd7896646189e11934dddce7..b84ed371da94ca0e259529ad63ef4bbd7a33df1c 100644 --- a/roles/keycloak/tasks/main.yml +++ b/roles/keycloak/tasks/main.yml @@ -37,7 +37,7 @@ no_log: true - name: Start and enable keycloak - systemd: name=keycloak enabled=yes daemon_reload=yes state=started + systemd_service: name=keycloak enabled=yes daemon_reload=yes state=started - name: Wait for keycloak to initialize wait_for: port={{ keycloak_port }} diff --git a/roles/libvirt/tasks/main.yml b/roles/libvirt/tasks/main.yml index 9307576fbedb1e454a7f65a363c54eddfa4c0737..88bd055ce93bb12cf0f9aa8cbe8bcddac9a3842e 100644 --- a/roles/libvirt/tasks/main.yml +++ b/roles/libvirt/tasks/main.yml @@ -24,7 +24,7 @@ file: src=/etc/libvirt/qemu/networks/default.xml dest=/etc/libvirt/qemu/networks/autostart/default.xml state=link owner=root group=root - name: Start and enable libvirtd - systemd: name=libvirtd enabled=yes state=started daemon_reload=yes + systemd_service: name=libvirtd enabled=yes state=started daemon_reload=yes - name: Define the images storage pool community.libvirt.virt_pool: diff --git a/roles/loki/tasks/main.yml b/roles/loki/tasks/main.yml index 7bbbfca934dffe5446ffd527c117d2517f9e99f6..0b0d60a011208f2af8ab0e51e4a057555cd1c63e 100644 --- a/roles/loki/tasks/main.yml +++ b/roles/loki/tasks/main.yml @@ -33,4 +33,4 @@ copy: src=loki-override.conf dest=/etc/systemd/system/loki.service.d/override.conf owner=root group=root mode=0644 - name: Start and enable loki - systemd: name=loki.service enabled=yes daemon_reload=yes state=started + systemd_service: name=loki.service enabled=yes daemon_reload=yes state=started diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml index 9119c94db16305d26ddda37275aeb1b801e5edda..7e5b45498026c4c2e422e50d677b4e4005ae92fe 100644 --- a/roles/mailman/tasks/main.yml +++ b/roles/mailman/tasks/main.yml @@ -81,10 +81,10 @@ when: false - name: Start and enable postfix - systemd: name=postfix.service enabled=yes daemon_reload=yes state=started + systemd_service: name=postfix.service enabled=yes daemon_reload=yes state=started - name: Start and enable mailman{.service,-*.timer} - systemd: name={{ item }} enabled=yes daemon_reload=yes state=started + systemd_service: name={{ item }} enabled=yes daemon_reload=yes state=started loop: - mailman3.service - mailman3-digests.timer diff --git a/roles/matrix/handlers/main.yml b/roles/matrix/handlers/main.yml index 5e9cf6b047806e0fe0b1ccd736a3743820331644..8b3e5e475af91b4cb57bab238565b8eff57a32fd 100644 --- a/roles/matrix/handlers/main.yml +++ b/roles/matrix/handlers/main.yml @@ -1,33 +1,33 @@ - name: Restart synapse - systemd: + systemd_service: name: synapse state: restarted enabled: true daemon_reload: true - name: Restart pantalaimon - systemd: + systemd_service: name: pantalaimon state: restarted enabled: true daemon_reload: true - name: Restart draupnir - systemd: + systemd_service: name: draupnir state: restarted enabled: true daemon_reload: true - name: Restart matrix-appservice-irc - systemd: + systemd_service: name: matrix-appservice-irc state: restarted enabled: true daemon_reload: true - name: Restart turnserver - systemd: + systemd_service: name: turnserver state: restarted enabled: true diff --git a/roles/mirrorsync/tasks/sync.yml b/roles/mirrorsync/tasks/sync.yml index 93de917326f4a670c754ecef8a09ec998ebdd7fb..3d5838355ac35ee68e60b866da49f823a5414973 100644 --- a/roles/mirrorsync/tasks/sync.yml +++ b/roles/mirrorsync/tasks/sync.yml @@ -8,4 +8,4 @@ template: src=mirrorsync.timer.j2 dest=/etc/systemd/system/sync{{ item.key }}.timer owner=root group=root mode=0644 - name: Start and enable timer for {{ item.key }} - systemd: name=sync{{ item.key }}.timer enabled=yes state=started daemon_reload=yes + systemd_service: name=sync{{ item.key }}.timer enabled=yes state=started daemon_reload=yes diff --git a/roles/networking/handlers/main.yml b/roles/networking/handlers/main.yml index c622aec0dba429daf95cb46e24b7958da0a98e28..147e784c3f376476148a4aba90e2c7a6510da88b 100644 --- a/roles/networking/handlers/main.yml +++ b/roles/networking/handlers/main.yml @@ -1,5 +1,5 @@ - name: Restart networkd - systemd: + systemd_service: name: systemd-networkd state: restarted daemon_reload: true diff --git a/roles/networking/tasks/main.yml b/roles/networking/tasks/main.yml index 07d133a85b1f89b870dd6a0275b6ecd94cb9cb8a..35633eab4714cb45647e62a9be3b159029918248 100644 --- a/roles/networking/tasks/main.yml +++ b/roles/networking/tasks/main.yml @@ -58,7 +58,7 @@ - "'hcloud' in group_names or inventory_hostname == 'packer-base-image'" - name: Start and enable hcloud-init - systemd: name=hcloud-init daemon_reload=yes state=started enabled=yes + systemd_service: name=hcloud-init daemon_reload=yes state=started enabled=yes when: - chroot_path | length == 0 - "'hcloud' in group_names or inventory_hostname == 'packer-base-image'" diff --git a/roles/opensearch/handlers/main.yml b/roles/opensearch/handlers/main.yml index 2a0f9c48a86f3b27cbd726cc157a1421757f5ff0..fbdae2947450097b7b72868c982945eecef74777 100644 --- a/roles/opensearch/handlers/main.yml +++ b/roles/opensearch/handlers/main.yml @@ -1,2 +1,2 @@ - name: Restart opensearch - systemd: name=opensearch state=restarted + systemd_service: name=opensearch state=restarted diff --git a/roles/opensearch/tasks/main.yml b/roles/opensearch/tasks/main.yml index 97fda5bec2fc0f983a1621109426fe6968e53ddc..2142798ab1f45081ce86da7ea0912dd9b5d2b4e8 100644 --- a/roles/opensearch/tasks/main.yml +++ b/roles/opensearch/tasks/main.yml @@ -26,4 +26,4 @@ - firewall - name: Start and enable opensearch - systemd: name=opensearch.service enabled=yes state=started + systemd_service: name=opensearch.service enabled=yes state=started diff --git a/roles/php_fpm/handlers/main.yaml b/roles/php_fpm/handlers/main.yaml index 53c25acb653061ac6585331c532338b68ce70faa..71c5a8270d8399cd2d01a9fa009728993b7b91dd 100644 --- a/roles/php_fpm/handlers/main.yaml +++ b/roles/php_fpm/handlers/main.yaml @@ -1,3 +1,3 @@ - name: Daemon reload - systemd: + systemd_service: daemon-reload: true diff --git a/roles/phrik/tasks/main.yml b/roles/phrik/tasks/main.yml index c3aad23db3873dfa449bc21575df1a7ade90dcbd..24ac1038b8d62f664b5a3e21101af30e7e7b3820 100644 --- a/roles/phrik/tasks/main.yml +++ b/roles/phrik/tasks/main.yml @@ -29,7 +29,7 @@ copy: src=phrik.service dest=/etc/systemd/system/phrik.service owner=root group=root mode=0644 - name: Start and enable pkgfile and phrikservice - systemd: + systemd_service: name: "{{ item }}" enabled: true state: started diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index 42cd4e04686aa41b180bee515f50538ffba74551..48e8e136ddbb3bacd7ddff288dfcdd067e1608a1 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -20,7 +20,7 @@ when: not prometheus_receive_only - name: Enable prometheus server service - systemd: name=prometheus enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus enabled=yes daemon_reload=yes state=started - name: Open prometheus port for monitoring.archlinux.org ansible.posix.firewalld: zone=wireguard state=enabled permanent=true immediate=yes diff --git a/roles/prometheus_exporters/tasks/main.yml b/roles/prometheus_exporters/tasks/main.yml index ba077e0e71434610e8d9f4b7edba31c738d80c5f..a3db869f322728fe93eae7ebf85f50d09813810c 100644 --- a/roles/prometheus_exporters/tasks/main.yml +++ b/roles/prometheus_exporters/tasks/main.yml @@ -36,7 +36,7 @@ when: "'mysql_servers' in group_names" - name: Enable prometheus-mysqld-exporter service - systemd: name=prometheus-mysqld-exporter enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-mysqld-exporter enabled=yes daemon_reload=yes state=started when: "'mysql_servers' in group_names" - name: Copy prometheus memcached exporter configuration @@ -71,7 +71,7 @@ template: src=prometheus-arch-textcollector.timer.j2 dest=/etc/systemd/system/prometheus-arch-textcollector.timer owner=root group=root mode=644 - name: Enable and start prometheus arch textcollector timer - systemd: name=prometheus-arch-textcollector.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-arch-textcollector.timer enabled=yes daemon_reload=yes state=started - name: Install borg textcollector services template: src=prometheus-borg-textcollector.service.j2 dest=/etc/systemd/system/prometheus-{{ item.name }}-textcollector.service owner=root group=root mode=644 @@ -81,7 +81,7 @@ when: "'borg_clients' in group_names" - name: Enable borg textcollector services - systemd: name=prometheus-{{ item.name }}-textcollector.service enabled=yes daemon_reload=yes + systemd_service: name=prometheus-{{ item.name }}-textcollector.service enabled=yes daemon_reload=yes loop: - { name: borg, service: borg-backup } - { name: borg-offsite, service: borg-backup-offsite } @@ -96,7 +96,7 @@ when: ansible_virtualization_role == "host" - name: Enable and start prometheus smart textcollector timer - systemd: name=prometheus-smart-textcollector.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-smart-textcollector.timer enabled=yes daemon_reload=yes state=started when: ansible_virtualization_role == "host" - name: Install hetzner textcollector service @@ -108,7 +108,7 @@ when: "inventory_hostname == 'monitoring.archlinux.org'" - name: Enable and start prometheus hetzner textcollector timer - systemd: name=prometheus-hetzner-textcollector.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-hetzner-textcollector.timer enabled=yes daemon_reload=yes state=started when: "inventory_hostname == 'monitoring.archlinux.org'" - name: Install gitlab-exporter @@ -127,7 +127,7 @@ when: "inventory_hostname == 'gitlab.archlinux.org'" - name: Enable and start gitlab-exporter timer - systemd: name=gitlab-exporter.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=gitlab-exporter.timer enabled=yes daemon_reload=yes state=started when: "inventory_hostname == 'gitlab.archlinux.org'" - name: Install fail2ban textcollector service @@ -137,7 +137,7 @@ template: src=prometheus-fail2ban-textcollector.timer.j2 dest=/etc/systemd/system/prometheus-fail2ban-textcollector.timer owner=root group=root mode=644 - name: Enable and start prometheus fail2ban textcollector timer - systemd: name=prometheus-fail2ban-textcollector.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-fail2ban-textcollector.timer enabled=yes daemon_reload=yes state=started - name: Install blackbox exporter configuration template: src=blackbox.yml.j2 dest=/etc/prometheus/blackbox.yml owner=root group=root mode=0644 @@ -153,7 +153,7 @@ when: "'rebuilderd' in group_names" - name: Enable and start prometheus rebuilderd textcollector timer - systemd: name=prometheus-rebuilderd-textcollector.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-rebuilderd-textcollector.timer enabled=yes daemon_reload=yes state=started when: "'rebuilderd' in group_names" - name: Install rebuilderd textcollector service @@ -169,7 +169,7 @@ when: "'archive_mirrors' in group_names or inventory_hostname == 'gemini.archlinux.org'" - name: Enable and start prometheus archive textcollector timer - systemd: name=prometheus-archive-textcollector.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-archive-textcollector.timer enabled=yes daemon_reload=yes state=started when: "'archive_mirrors' in group_names or inventory_hostname == 'gemini.archlinux.org'" - name: Install rebuilderd textcollector timer @@ -177,7 +177,7 @@ when: "inventory_hostname == 'gemini.archlinux.org'" - name: Enable and start prometheus repository textcollector timer - systemd: name=prometheus-repository-textcollector.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-repository-textcollector.timer enabled=yes daemon_reload=yes state=started when: "inventory_hostname == 'gemini.archlinux.org'" - name: Install fastly textcollector script @@ -192,7 +192,7 @@ when: "inventory_hostname == 'monitoring.archlinux.org'" - name: Enable and start prometheus fastly textcollector timer - systemd: name=prometheus-fastly-textcollector.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-fastly-textcollector.timer enabled=yes daemon_reload=yes state=started when: "inventory_hostname == 'monitoring.archlinux.org'" - name: Install sudoers for btrfs @@ -208,18 +208,18 @@ when: filesystem == "btrfs" - name: Enable and start prometheus btrfs textcollector timer - systemd: name=prometheus-btrfs-textcollector.timer enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-btrfs-textcollector.timer enabled=yes daemon_reload=yes state=started when: filesystem == "btrfs" - name: Enable prometheus-node-exporter service - systemd: name=prometheus-node-exporter enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-node-exporter enabled=yes daemon_reload=yes state=started - name: Enable prometheus-blackbox-exporter service - systemd: name=prometheus-blackbox-exporter enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-blackbox-exporter enabled=yes daemon_reload=yes state=started when: "'prometheus' in group_names" - name: Enable prometheus-memcached-exporter service - systemd: name=prometheus-memcached-exporter enabled=yes daemon_reload=yes state=started + systemd_service: name=prometheus-memcached-exporter enabled=yes daemon_reload=yes state=started when: "'memcached' in group_names" - name: Open prometheus-node-exporter ipv4 port for monitoring.archlinux.org diff --git a/roles/promtail/handlers/main.yml b/roles/promtail/handlers/main.yml index 7049090a4e4915e74d7b9ed429940896d2d92362..b22bf38d89d52cab25234c72caaaa7f61cdd2faa 100644 --- a/roles/promtail/handlers/main.yml +++ b/roles/promtail/handlers/main.yml @@ -1,2 +1,2 @@ - name: Restart promtail - systemd: name=promtail daemon_reload=yes state=restarted + systemd_service: name=promtail daemon_reload=yes state=restarted diff --git a/roles/promtail/tasks/main.yml b/roles/promtail/tasks/main.yml index 2756da993284a81c8dc1adc3ee35c66a9149ffaf..2c34f9ca298c70da0a7bb52ba31a600f08babfb1 100644 --- a/roles/promtail/tasks/main.yml +++ b/roles/promtail/tasks/main.yml @@ -19,4 +19,4 @@ notify: Restart promtail - name: Start and enable promtail - systemd: name=promtail.service enabled=yes daemon_reload=yes state=started + systemd_service: name=promtail.service enabled=yes daemon_reload=yes state=started diff --git a/roles/quassel/handlers/main.yml b/roles/quassel/handlers/main.yml index 6c908e34bc23740bef804236f1c11b4f5c8257e1..5ac07cc1de6353c3e5ad2f0c3217de155fffce1c 100644 --- a/roles/quassel/handlers/main.yml +++ b/roles/quassel/handlers/main.yml @@ -1,2 +1,2 @@ - name: Daemon reload - systemd: daemon_reload=yes + systemd_service: daemon_reload=yes diff --git a/roles/rebuilderd/tasks/main.yml b/roles/rebuilderd/tasks/main.yml index 9e7de405880240cd5a95a97ee14fdc80f4c29f63..7ab24fc4c82ea32ab2de5097ea87f199f2d8e62c 100644 --- a/roles/rebuilderd/tasks/main.yml +++ b/roles/rebuilderd/tasks/main.yml @@ -23,8 +23,8 @@ tags: ['nginx'] - name: Enable and start rebuilderd - systemd: name=rebuilderd enabled=yes state=started + systemd_service: name=rebuilderd enabled=yes state=started - name: Enable and start rebuilderd-sync timer for {{ item }} - systemd: name=rebuilderd-sync@archlinux-{{ item }}.timer enabled=yes state=started + systemd_service: name=rebuilderd-sync@archlinux-{{ item }}.timer enabled=yes state=started with_items: "{{ suites }}" diff --git a/roles/rebuilderd_worker/handlers/main.yml b/roles/rebuilderd_worker/handlers/main.yml index 53c25acb653061ac6585331c532338b68ce70faa..71c5a8270d8399cd2d01a9fa009728993b7b91dd 100644 --- a/roles/rebuilderd_worker/handlers/main.yml +++ b/roles/rebuilderd_worker/handlers/main.yml @@ -1,3 +1,3 @@ - name: Daemon reload - systemd: + systemd_service: daemon-reload: true diff --git a/roles/rebuilderd_worker/tasks/main.yml b/roles/rebuilderd_worker/tasks/main.yml index c145cb41d4b37cb188320d6070210401062cd93a..8b6a286c719d096e0f64ecfb8cc87a4948a8fb30 100644 --- a/roles/rebuilderd_worker/tasks/main.yml +++ b/roles/rebuilderd_worker/tasks/main.yml @@ -11,7 +11,7 @@ copy: src=repro.conf dest=/etc/archlinux-repro/repro.conf owner=root group=root mode=0660 - name: Enable and start rebuilderd-worker@{{ item }} - systemd: name=rebuilderd-worker@{{ item }} enabled=yes state=started + systemd_service: name=rebuilderd-worker@{{ item }} enabled=yes state=started with_items: '{{ rebuilderd_workers }}' - name: Install cleanup script diff --git a/roles/security_tracker/tasks/main.yml b/roles/security_tracker/tasks/main.yml index f689f48d07227cbf8292bfcc3ff3ea0928d54e63..cfd89eb4db1323fc8fdb5b6e04c3edb4c3d0b6e9 100644 --- a/roles/security_tracker/tasks/main.yml +++ b/roles/security_tracker/tasks/main.yml @@ -108,7 +108,7 @@ when: release.changed - name: Start and enable security-tracker timer - systemd: + systemd_service: name: security-tracker-update.timer enabled: true state: started diff --git a/roles/tempo/tasks/main.yml b/roles/tempo/tasks/main.yml index a7ed27a47c0a98dd66c54ee02e0d1edbc781d318..3ddb231d097ce07f215aaea7956dd96445e751cf 100644 --- a/roles/tempo/tasks/main.yml +++ b/roles/tempo/tasks/main.yml @@ -13,4 +13,4 @@ - Restart tempo - name: Enable tempo server service - systemd: name=tempo enabled=yes daemon_reload=yes state=started + systemd_service: name=tempo enabled=yes daemon_reload=yes state=started