Merge branch 'master' of /git/ansible

playbooks/groups/wiki.yml

@@ -25,7 +25,7 @@
   - collectd/base
   - apache
   - fedmsg/base
-  - { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments',  nfs_src_dir: 'fedora_app_staging/app/attachments' }
+  #- { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments',  nfs_src_dir: 'fedora_app_staging/app/attachments' }
   - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments',  nfs_src_dir: 'fedora_app/app/attachments' }
   - { role: mediawiki, when: env != "staging" }
   - { role: mediawiki, when: env == "staging" }

roles/mirrormanager/frontend2/tasks/main.yml

@@ -50,6 +50,14 @@
   - mm2_frontend
   - config
 
+- name: set sebooleans so mirrormanager can send exception mails
+  action: seboolean name=httpd_can_sendmail
+                    state=true
+                    persistent=true
+  tags:
+  - mm2_frontend
+  - config
+
 - name: startup apache
   service: name=httpd enabled=yes state=started
   tags:

roles/mirrormanager/frontend2/templates/mirrormanager2.cfg

@@ -58,7 +58,7 @@ MM_AUTHENTICATION = 'fas'
 ADMIN_GROUP = ('sysadmin-main', 'sysadmin-web')
 
 # Email of the admin to which send notification or error
-ADMIN_EMAIL = 'admin@fedoraproject.org'
+ADMIN_EMAIL = ['admin@fedoraproject.org', 'adrian@fedoraproject.org']
 
 # Email address used in the 'From' field of the emails sent.
 # Default: ``nobody@fedoraproject.org``.