diff options
Diffstat (limited to 'roles/nextcloud')
-rw-r--r-- | roles/nextcloud/tasks/main.yml | 33 | ||||
-rw-r--r-- | roles/nextcloud/templates/cron-.timer.j2 (renamed from roles/nextcloud/templates/cron@.timer.j2) | 1 |
2 files changed, 13 insertions, 21 deletions
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 90a65fc6..190afb47 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -47,8 +47,6 @@ - name: create nextcloud app subdirectory loop: "{{ nextcloud_instances | list }}" - loop_control: - label: "{{ item }}" file: path: "{{ nextcloud_base_path }}/{{ item }}/nextcloud" owner: "{{ nextcloud_app_uid }}" @@ -81,16 +79,12 @@ - name: create image config dir loop: "{{ nextcloud_instances | list }}" - loop_control: - label: "{{ item }}" file: path: "{{ nextcloud_base_path }}/{{ item }}/config" state: directory - name: create apache vhost config loop: "{{ nextcloud_instances | list }}" - loop_control: - label: "{{ item }}" copy: content: | <VirtualHost *:8080> @@ -107,8 +101,6 @@ - name: configure apache to run on port 8080 only loop: "{{ nextcloud_instances | list }}" - loop_control: - label: "{{ item }}" copy: content: | Listen 8080 @@ -116,21 +108,11 @@ - name: install cron trigger script loop: "{{ nextcloud_instances | list }}" - loop_control: - label: "{{ item }}" template: src: run-cron.sh.j2 dest: "{{ nextcloud_base_path }}/{{ item }}/config/run-cron.sh" mode: 0755 -- name: install template systemd units for cron trigger - loop: - - service - - timer - template: - src: "cron@.{{ item }}.j2" - dest: "/etc/systemd/system/nextcloud-cron@.{{ item }}" - - name: generate pod manifests loop: "{{ nextcloud_instances | dict2items }}" @@ -142,12 +124,21 @@ mode: 0600 +- name: install template systemd unit for cron trigger + template: + src: cron@.service.j2 + dest: /etc/systemd/system/nextcloud-cron@.service + +- name: install systemd timer unit + loop: "{{ nextcloud_instances | list }}" + template: + src: cron-.timer.j2 + dest: "/etc/systemd/system/nextcloud-cron-{{ item }}.timer" + - name: start/enable cron trigger systemd timer loop: "{{ nextcloud_instances | list }}" - loop_control: - label: "{{ item }}" systemd: daemon_reload: yes - name: "nextcloud-cron@{{ item }}.timer" + name: "nextcloud-cron-{{ item }}.timer" state: started enabled: yes diff --git a/roles/nextcloud/templates/cron@.timer.j2 b/roles/nextcloud/templates/cron-.timer.j2 index fc7a247d..7285bf03 100644 --- a/roles/nextcloud/templates/cron@.timer.j2 +++ b/roles/nextcloud/templates/cron-.timer.j2 @@ -3,6 +3,7 @@ Description=Nextcloud cron.php job timer for %i [Timer] OnCalendar=*:{{ 15 | random(seed=item) }}/15 +Unit=nextcloud-cron@{{ item }}.service [Install] WantedBy=timers.target |