From e24b51e3da3448dc209335b6b2f058e08d5fd771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20Torma?= Date: Mon, 18 Jul 2022 16:55:17 +0200 Subject: [PATCH] change from systemd to cron --- .../backupscript/files/backup-script.service | 9 ---- roles/backupscript/files/backup.target | 5 --- roles/backupscript/files/backup.timer | 10 ----- roles/backupscript/tasks/main.yaml | 45 +------------------ roles/webgateway/files/certbot-script.service | 9 ---- roles/webgateway/files/certbot.target | 5 --- roles/webgateway/files/certbot.timer | 10 ----- roles/webgateway/tasks/main.yaml | 42 +---------------- 8 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 roles/backupscript/files/backup-script.service delete mode 100644 roles/backupscript/files/backup.target delete mode 100644 roles/backupscript/files/backup.timer delete mode 100644 roles/webgateway/files/certbot-script.service delete mode 100644 roles/webgateway/files/certbot.target delete mode 100644 roles/webgateway/files/certbot.timer diff --git a/roles/backupscript/files/backup-script.service b/roles/backupscript/files/backup-script.service deleted file mode 100644 index 24c483a..0000000 --- a/roles/backupscript/files/backup-script.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Backup application data - -[Service] -Type=simple -ExecStart=/usr/bin/bash /opt/backupscript.sh - -[Install] -WantedBy=backup.target diff --git a/roles/backupscript/files/backup.target b/roles/backupscript/files/backup.target deleted file mode 100644 index a0e185f..0000000 --- a/roles/backupscript/files/backup.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Script based backup for VMs - -[Install] -WantedBy=default.target diff --git a/roles/backupscript/files/backup.timer b/roles/backupscript/files/backup.timer deleted file mode 100644 index 759d229..0000000 --- a/roles/backupscript/files/backup.timer +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Backup VMs - -[Timer] -OnBootSec=10min -OnCalendar=Sun *-*-* 00:00:00 -Unit=backup.target - -[Install] -WantedBy=multi-user.target diff --git a/roles/backupscript/tasks/main.yaml b/roles/backupscript/tasks/main.yaml index fa4ef96..46786e2 100644 --- a/roles/backupscript/tasks/main.yaml +++ b/roles/backupscript/tasks/main.yaml @@ -2,54 +2,11 @@ - name: "Generate backupscript" ansible.builtin.template: src: backupscript.sh - dest: /opt/backupscript.sh + dest: /etc/cron.weekly/backupscript.sh owner: root group: root mode: '0700' -- name: Copy backup-script.service to target - copy: - src: backup-script.service - dest: /usr/lib/systemd/system/backup-script.service - mode: 0644 - owner: root - group: root - -- name: Copy backup.target to target - copy: - src: backup.target - dest: /usr/lib/systemd/system/backup.target - mode: 0644 - owner: root - group: root - -- name: Copy backup.timer to target - copy: - src: backup.timer - dest: /usr/lib/systemd/system/backup.timer - mode: 0644 - owner: root - group: root - -- name: Enable backup-script.service and reload systemd daemon - when: ansible_service_mgr == "systemd" - ansible.builtin.systemd: - enabled: yes - daemon_reload: yes - name: backup-script.service - -- name: Enable backup.target - when: ansible_service_mgr == "systemd" - ansible.builtin.systemd: - enabled: yes - name: backup.target - -- name: Enable backup.timer - when: ansible_service_mgr == "systemd" - ansible.builtin.systemd: - enabled: yes - name: backup.timer - - name: Create .ssh directory of root user file: path: /root/.ssh diff --git a/roles/webgateway/files/certbot-script.service b/roles/webgateway/files/certbot-script.service deleted file mode 100644 index 4d755a5..0000000 --- a/roles/webgateway/files/certbot-script.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Renew certificates with certbot - -[Service] -Type=simple -ExecStart=/usr/bin/bash /opt/certbot.sh - -[Install] -WantedBy=certbot.target \ No newline at end of file diff --git a/roles/webgateway/files/certbot.target b/roles/webgateway/files/certbot.target deleted file mode 100644 index 67fed4a..0000000 --- a/roles/webgateway/files/certbot.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Script based certificate renewal via certbot - -[Install] -WantedBy=default.target \ No newline at end of file diff --git a/roles/webgateway/files/certbot.timer b/roles/webgateway/files/certbot.timer deleted file mode 100644 index 38c8d41..0000000 --- a/roles/webgateway/files/certbot.timer +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Periodic certificate renewal - -[Timer] -OnBootSec=10min -OnCalendar=Sun *-*-* 00:00:00 -Unit=certbot.target - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/roles/webgateway/tasks/main.yaml b/roles/webgateway/tasks/main.yaml index 4c26bb3..3736849 100644 --- a/roles/webgateway/tasks/main.yaml +++ b/roles/webgateway/tasks/main.yaml @@ -50,51 +50,11 @@ - name: "Generate certbot script" ansible.builtin.template: src: certbot.sh - dest: /opt/certbot.sh + dest: /etc/cron.weekly/certbot.sh owner: root group: root mode: '0700' -- name: Copy certbot-script.service to target - copy: - src: certbot-script.service - dest: /usr/lib/systemd/system/certbot-script.service - mode: 644 - owner: root - -- name: Copy certbot.target to target - copy: - src: certbot.target - dest: /usr/lib/systemd/system/certbot.target - mode: 644 - owner: root - -- name: Copy certbot.timer to target - copy: - src: certbot.timer - dest: /usr/lib/systemd/system/certbot.timer - mode: 644 - owner: root - -- name: Enable certbot-script.service and reload systemd daemon - when: ansible_service_mgr == "systemd" - ansible.builtin.systemd: - enabled: yes - daemon_reload: yes - name: certbot-script.service - -- name: Enable certbot.target - when: ansible_service_mgr == "systemd" - ansible.builtin.systemd: - enabled: yes - name: certbot.target - -- name: Enable certbot.timer - when: ansible_service_mgr == "systemd" - ansible.builtin.systemd: - enabled: yes - name: certbot.timer - - name: "Generate nginx configuration" ansible.builtin.template: src: nginx.conf