Merge branch 'master' of /git/ansible

handlers/restart_services.yml

@@ -173,3 +173,7 @@
 
 - name: restart idmapd
   service: name=nfs-idmapd state=restarted
+
+- name: restart darkserver
+  service: name=darkserver state=restarted
+

roles/anitya/frontend/templates/anitya.cfg

@@ -18,6 +18,7 @@ ANITYA_WEB_ADMINS = [
     'http://ralph.id.fedoraproject.org/',
     'http://pingou.id.fedoraproject.org/',
     'http://jcline.id.fedoraproject.org/',
+    'http://tibbs.id.fedoraproject.org/',
 ]
 
 # Email addresses to send tracebacks to when an HTTP 500 occurs

roles/darkserver/backend/tasks/main.yml

@@ -18,9 +18,6 @@
 - name: email.json file
   copy: src=email.json dest=/etc/darkserver/email.json owner=root group=root mode=0644
 
-- name: darkserver service
-  service: name=darkserver state=started enabled=yes
-
 - name: darkjobworker.conf
   template: src=darkjobworker.conf.j2 dest=/etc/darkserver/darkjobworker.conf owner=root group=root mode=640
   notify: restart darkserver

roles/darkserver/backend/templates/darkjobworker.conf.j2

@@ -1,5 +1,5 @@
 [darkserver]
-{% if environment == "staging" %}
+{% if env == "staging" %}
 host=db01.stg.phx2.fedoraproject.org
 password={{ darkserver_stg_writer_password }}
 {% else %}