diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index ec789e67c2..106c547f7e 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -39,6 +39,7 @@ roles: - abrt/faf-local - { role: abrt/faf, faf_web_on_root: false, faf_admin_mail: msuchy@redhat.com, faf_web_openid_privileged_teams: "provenpackager,proventesters", faf_web_secret_key: "{{fedora_faf_web_secret_key}}", faf_spool_dir: /srv/faf/ } + - abrt/faf-local-post - name: setup retrace server hosts: retrace:retrace-stg diff --git a/roles/abrt/faf-local-post/defaults/main.yml b/roles/abrt/faf-local-post/defaults/main.yml new file mode 100644 index 0000000000..61d58e18e0 --- /dev/null +++ b/roles/abrt/faf-local-post/defaults/main.yml @@ -0,0 +1,6 @@ +--- +# +n = greater; -n = less; n = exactly n days +archive_age: '+14' + +# Delete deferred reports +deferred_age: '+7' diff --git a/roles/abrt/faf-local-post/handlers/main.yml b/roles/abrt/faf-local-post/handlers/main.yml new file mode 100644 index 0000000000..1ac3f2273f --- /dev/null +++ b/roles/abrt/faf-local-post/handlers/main.yml @@ -0,0 +1,7 @@ +--- +- name: restart httpd + service: name=httpd state=restarted + +- name: restart postgresql + service: name=postgresql + state=restarted diff --git a/roles/abrt/faf-local/tasks/cron.yml b/roles/abrt/faf-local-post/tasks/cron.yml similarity index 100% rename from roles/abrt/faf-local/tasks/cron.yml rename to roles/abrt/faf-local-post/tasks/cron.yml diff --git a/roles/abrt/faf-local-post/tasks/main.yml b/roles/abrt/faf-local-post/tasks/main.yml new file mode 100644 index 0000000000..6551bbdb76 --- /dev/null +++ b/roles/abrt/faf-local-post/tasks/main.yml @@ -0,0 +1,21 @@ +--- +# the magic with ! is that it return exit code 1 if 'already defined' is not present in output +- name: add repositories + shell: ! faf repoadd --nogpgcheck "{{ item.name }}" yum "{{ item.url }}" 2>&1 | grep 'already defined' + become: yes + become_user: faf + ignore_errors: yes + when: not devel + tags: add_repo + with_items: "{{ faf_repos }}" + +- name: repoassign repositories + command: faf repoassign "{{ item.name }}" "{{ item.opsys }}" "{{ item.arch }}" + become: yes + become_user: faf + when: not devel + tags: add_repo + with_items: "{{ faf_repos }}" + +- import_tasks: cron.yml + tags: cron diff --git a/roles/abrt/faf-local/defaults/main.yml b/roles/abrt/faf-local/defaults/main.yml index 61d58e18e0..ed97d539c0 100644 --- a/roles/abrt/faf-local/defaults/main.yml +++ b/roles/abrt/faf-local/defaults/main.yml @@ -1,6 +1 @@ --- -# +n = greater; -n = less; n = exactly n days -archive_age: '+14' - -# Delete deferred reports -deferred_age: '+7' diff --git a/roles/abrt/faf-local/tasks/main.yml b/roles/abrt/faf-local/tasks/main.yml index aeedc746be..1f1f479e90 100644 --- a/roles/abrt/faf-local/tasks/main.yml +++ b/roles/abrt/faf-local/tasks/main.yml @@ -60,24 +60,3 @@ regexp: 'MORE_SATYR =' line: ' MORE_SATYR = "https://github.com/abrt/satyr/"' notify: restart httpd - -# the magic with ! is that it return exit code 1 if 'already defined' is not present in output -- name: add repositories - shell: ! faf repoadd --nogpgcheck "{{ item.name }}" yum "{{ item.url }}" 2>&1 | grep 'already defined' - become: yes - become_user: faf - ignore_errors: yes - when: not devel - tags: add_repo - with_items: "{{ faf_repos }}" - -- name: repoassign repositories - command: faf repoassign "{{ item.name }}" "{{ item.opsys }}" "{{ item.arch }}" - become: yes - become_user: faf - when: not devel - tags: add_repo - with_items: "{{ faf_repos }}" - -- import_tasks: cron.yml - tags: cron