From e03a74821c63ab23ffcea118c05df188a687298d Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Mon, 20 Jan 2020 13:54:14 -0600 Subject: Fixed systemd timer states. --- roles/pleroma-otp/files/pleroma-s3-backup@.service | 2 +- roles/pleroma-otp/handlers/main.yaml | 2 +- roles/pleroma-otp/tasks/main.yaml | 2 +- roles/pleroma-otp/tasks/s3-backup.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/pleroma-otp/files/pleroma-s3-backup@.service b/roles/pleroma-otp/files/pleroma-s3-backup@.service index 7459f02..a64cae3 100644 --- a/roles/pleroma-otp/files/pleroma-s3-backup@.service +++ b/roles/pleroma-otp/files/pleroma-s3-backup@.service @@ -3,7 +3,7 @@ Description=Pleroma s3 backup for instance "%I" [Service] Type=oneshot -ExecStart=/usr/local/bin/pleroma-prepare-backup.sh %i +ExecStart=/usr/local/bin/pleroma-s3-backup.sh %i [Install] WantedBy=aws-s3-backup.target diff --git a/roles/pleroma-otp/handlers/main.yaml b/roles/pleroma-otp/handlers/main.yaml index 382fb67..0fad634 100644 --- a/roles/pleroma-otp/handlers/main.yaml +++ b/roles/pleroma-otp/handlers/main.yaml @@ -6,4 +6,4 @@ - name: restart pleroma instance s3 backup become: yes - systemd: name="pleroma-s3-backup@{{pleroma_instance}}.service" state="restarted" daemon_reload="yes" + systemd: name="pleroma-s3-backup@{{pleroma_instance}}.service" enabled="yes" daemon_reload="yes" diff --git a/roles/pleroma-otp/tasks/main.yaml b/roles/pleroma-otp/tasks/main.yaml index d3e4f23..5276935 100644 --- a/roles/pleroma-otp/tasks/main.yaml +++ b/roles/pleroma-otp/tasks/main.yaml @@ -76,7 +76,7 @@ - "/tmp/release/" when: pleroma_cleanup_tmp -- import_tasks: s3-backup.yml +- import_tasks: s3-backup.yaml when: pleroma_s3_backup_enabled - name: configure pleroma systemd service diff --git a/roles/pleroma-otp/tasks/s3-backup.yaml b/roles/pleroma-otp/tasks/s3-backup.yaml index e00cacc..72baa3c 100644 --- a/roles/pleroma-otp/tasks/s3-backup.yaml +++ b/roles/pleroma-otp/tasks/s3-backup.yaml @@ -17,4 +17,4 @@ - name: ensure s3 backup is enabled become: yes - systemd: name="pleroma-s3-backup@{{pleroma_instance}}.service" enabled="yes" state="started" + systemd: name="pleroma-s3-backup@{{pleroma_instance}}.service" enabled="yes" -- cgit v1.2.3