summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiroslav Suchý <msuchy@redhat.com>2017-04-28 11:42:46 +0200
committerMiroslav Suchý <msuchy@redhat.com>2017-04-28 11:44:36 +0200
commitad34f705933252e35c41002ea839b63e91406fde (patch)
tree267aa910461fa8cc81a8c3c0cde6e2b6fea7ba3b
parentbaa8007d040e2bc609b75fbb8cf38cde4fe09d79 (diff)
downloadansible-ad34f705933252e35c41002ea839b63e91406fde.tar.gz
ansible-ad34f705933252e35c41002ea839b63e91406fde.tar.xz
ansible-ad34f705933252e35c41002ea839b63e91406fde.zip
retrace: update from upstream roles
-rw-r--r--roles/abrt/faf-local/files/group_abrt-faf-el7-epel-7.repo (renamed from roles/abrt/faf/files/group_abrt-faf-el7-epel-7.repo)0
-rw-r--r--roles/abrt/faf/defaults/main.yml2
-rw-r--r--roles/abrt/faf/files/group_abrt--el7-epel-7.repo10
-rw-r--r--roles/abrt/faf/meta/.galaxy_install_info2
-rw-r--r--roles/abrt/faf/tasks/check.yml2
-rw-r--r--roles/abrt/faf/tasks/cron.yml27
-rw-r--r--roles/abrt/faf/templates/etc--.conf.j2 (renamed from roles/abrt/faf/templates/etc-faf-faf.conf.j2)4
-rw-r--r--roles/abrt/faf/templates/etc--plugins-web.conf.j2 (renamed from roles/abrt/faf/templates/etc-faf-plugins-web.conf.j2)2
-rw-r--r--roles/abrt/faf/templates/etc-httpd-conf.d--web.conf.j2 (renamed from roles/abrt/faf/templates/etc-httpd-conf.d-faf-web.conf.j2)2
-rw-r--r--roles/abrt/retrace/meta/.galaxy_install_info2
-rw-r--r--roles/abrt/retrace/templates/-server-httpd.conf.j2 (renamed from roles/abrt/retrace/templates/retrace-server-httpd.conf.j2)0
-rw-r--r--roles/abrt/retrace/templates/etc--server.conf.j2 (renamed from roles/abrt/retrace/templates/etc-retrace-server.conf.j2)0
12 files changed, 42 insertions, 11 deletions
diff --git a/roles/abrt/faf/files/group_abrt-faf-el7-epel-7.repo b/roles/abrt/faf-local/files/group_abrt-faf-el7-epel-7.repo
index ec4e5fa89..ec4e5fa89 100644
--- a/roles/abrt/faf/files/group_abrt-faf-el7-epel-7.repo
+++ b/roles/abrt/faf-local/files/group_abrt-faf-el7-epel-7.repo
diff --git a/roles/abrt/faf/defaults/main.yml b/roles/abrt/faf/defaults/main.yml
index db48406fb..da50c0a49 100644
--- a/roles/abrt/faf/defaults/main.yml
+++ b/roles/abrt/faf/defaults/main.yml
@@ -31,6 +31,8 @@ faf_cron_jobs: true
faf_admin_mail: root@localhost
+faf_spool_dir: /var/spool/faf
+
###########################
# features configuration #
###########################
diff --git a/roles/abrt/faf/files/group_abrt--el7-epel-7.repo b/roles/abrt/faf/files/group_abrt--el7-epel-7.repo
new file mode 100644
index 000000000..ec4e5fa89
--- /dev/null
+++ b/roles/abrt/faf/files/group_abrt--el7-epel-7.repo
@@ -0,0 +1,10 @@
+[group_abrt-faf-el7]
+name=Copr repo for faf-el7 owned by @abrt
+baseurl=https://copr-be.cloud.fedoraproject.org/results/@abrt/faf-el7/epel-7-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://copr-be.cloud.fedoraproject.org/results/@abrt/faf-el7/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
diff --git a/roles/abrt/faf/meta/.galaxy_install_info b/roles/abrt/faf/meta/.galaxy_install_info
index 3d7dc9d9d..4ee7008b9 100644
--- a/roles/abrt/faf/meta/.galaxy_install_info
+++ b/roles/abrt/faf/meta/.galaxy_install_info
@@ -1 +1 @@
-{install_date: 'Thu Apr 13 13:35:13 2017', version: ''}
+{install_date: 'Fri Apr 28 09:36:52 2017', version: ''}
diff --git a/roles/abrt/faf/tasks/check.yml b/roles/abrt/faf/tasks/check.yml
index 2ae755b83..4a08eaf36 100644
--- a/roles/abrt/faf/tasks/check.yml
+++ b/roles/abrt/faf/tasks/check.yml
@@ -12,7 +12,7 @@
- "compadd -o fedora --opsys-release 42 meta_faf"
- name: cpf
- copy: src=ureport_sample dest=/var/spool/faf/reports/incoming
+ copy: src=ureport_sample dest={{ faf_spool_dir }}/reports/incoming
owner=faf group=faf
- name: faf
diff --git a/roles/abrt/faf/tasks/cron.yml b/roles/abrt/faf/tasks/cron.yml
index 752d34492..1e702b072 100644
--- a/roles/abrt/faf/tasks/cron.yml
+++ b/roles/abrt/faf/tasks/cron.yml
@@ -4,20 +4,25 @@
cron:
name: "faf save-reports"
user: faf
- job: "faf save-reports >> /var/log/faf/save-reports.log 2>&1"
+ job: "faf save-reports --speedup >> /var/log/faf/save-reports.log 2>&1"
minute: "*/5"
state: present
become: yes
- name: cron create-problems
cron:
- name: "faf create-problems"
+ name: "faf create-problems with type {{ item}}"
user: faf
- job: "faf create-problems >> /var/log/faf/create-problems.log 2>&1"
+ job: "faf create-problems -p {{ item }} >> /var/log/faf/create-problems.log 2>&1"
minute: 30
- hour: "*/4"
+ hour: "2"
state: present
become: yes
+ with_items:
+ - "core"
+ - "kerneloops"
+ - "python"
+ - "ruby"
- name: cron reposync
cron:
@@ -28,3 +33,17 @@
hour: 3
state: present
become: yes
+
+- name: retrace symbols
+ cron:
+ name: "retrace symbols with type {{ item.type }}"
+ user: faf
+ job: "faf retrace --workers 4 -dp {{ item.type }} --max-fail-count 1 >> /var/log/faf/retrace-{{ item.type }}.log 2>&1"
+ minute: 32
+ hour: 2
+ weekday: "{{ item.day }}"
+ state: present
+ become: yes
+ with_items:
+ - { type: "core", day: "2,4,6" }
+ - { type: "kerneloops", day: "1,3,5" }
diff --git a/roles/abrt/faf/templates/etc-faf-faf.conf.j2 b/roles/abrt/faf/templates/etc--.conf.j2
index 6a62c300c..18c8a19dd 100644
--- a/roles/abrt/faf/templates/etc-faf-faf.conf.j2
+++ b/roles/abrt/faf/templates/etc--.conf.j2
@@ -8,7 +8,7 @@ AutoEnablePlugins = False
[Storage]
ConnectString = {{ faf_db_connectstring }}
-LobDir = /var/spool/faf/lob
+LobDir = {{ faf_spool_dir }}/lob
# Using platform-specific location by default.
# Uncomment and change if needed.
# TmpDir = /tmp
@@ -23,7 +23,7 @@ Password = {{ smtp_password|default("", true) }}
[uReport]
# The directory that holds 'reports' and 'attachments' subdirectories
-Directory = /var/spool/faf
+Directory = {{ faf_spool_dir }}
CreateComponents = False
# attachments accepted by this server
# allowed values: fedora-bugzilla rhel-bugzilla centos-mantisb comment email url
diff --git a/roles/abrt/faf/templates/etc-faf-plugins-web.conf.j2 b/roles/abrt/faf/templates/etc--plugins-web.conf.j2
index 9a6baa448..21c0d9d8f 100644
--- a/roles/abrt/faf/templates/etc-faf-plugins-web.conf.j2
+++ b/roles/abrt/faf/templates/etc--plugins-web.conf.j2
@@ -34,7 +34,7 @@ privileged_teams = {{ faf_web_openid_privileged_teams }}
{% endif %}
[DumpDir]
-CacheDirectory = /var/spool/faf/dumpdirs
+CacheDirectory = {{ faf_spool_dir }}/dumpdirs
CacheDirectoryCountQuota = 100
CacheDirectorySizeQuota = 107374182400
MaxDumpDirSize = 1073741824
diff --git a/roles/abrt/faf/templates/etc-httpd-conf.d-faf-web.conf.j2 b/roles/abrt/faf/templates/etc-httpd-conf.d--web.conf.j2
index 1de854dc7..33829aed9 100644
--- a/roles/abrt/faf/templates/etc-httpd-conf.d-faf-web.conf.j2
+++ b/roles/abrt/faf/templates/etc-httpd-conf.d--web.conf.j2
@@ -1,7 +1,7 @@
#{{ ansible_managed }}
# WSGI handler
WSGIPythonOptimize 1
-WSGISocketPrefix /var/spool/faf/wsgi
+WSGISocketPrefix {{ faf_spool_dir }} /wsgi
WSGIDaemonProcess faf user=faf group=faf processes=3 threads=5
{% set python = 'python2.7' %}
diff --git a/roles/abrt/retrace/meta/.galaxy_install_info b/roles/abrt/retrace/meta/.galaxy_install_info
index 3d7dc9d9d..2be619931 100644
--- a/roles/abrt/retrace/meta/.galaxy_install_info
+++ b/roles/abrt/retrace/meta/.galaxy_install_info
@@ -1 +1 @@
-{install_date: 'Thu Apr 13 13:35:13 2017', version: ''}
+{install_date: 'Fri Apr 28 09:36:53 2017', version: ''}
diff --git a/roles/abrt/retrace/templates/retrace-server-httpd.conf.j2 b/roles/abrt/retrace/templates/-server-httpd.conf.j2
index 593b2b858..593b2b858 100644
--- a/roles/abrt/retrace/templates/retrace-server-httpd.conf.j2
+++ b/roles/abrt/retrace/templates/-server-httpd.conf.j2
diff --git a/roles/abrt/retrace/templates/etc-retrace-server.conf.j2 b/roles/abrt/retrace/templates/etc--server.conf.j2
index edda02fab..edda02fab 100644
--- a/roles/abrt/retrace/templates/etc-retrace-server.conf.j2
+++ b/roles/abrt/retrace/templates/etc--server.conf.j2