Merge pull request #288 from lvillani/issue-284

Merge pull request #288

roles/ircbouncer/tasks/znc.yml

@@ -63,7 +63,3 @@
 
 - name: Ensure znc is a system service
   service: name=znc state=started enabled=true
-
-- name: Copy monit service config files into place
-  copy: src=etc_monit_conf.d_znc dest=/etc/monit/conf.d/znc
-  notify: restart monit

roles/monitoring/README.md

@@ -0,0 +1,2 @@
+This role should be enabled last in site.yml since it selectively installs configuration files
+based on the execution status of other roles before it.

roles/monitoring/tasks/monit.yml

@@ -15,3 +15,12 @@
     - sshd
     - tomcat
   notify: restart monit
+
+- name: Determine if ZNC is installed
+  stat: path=/var/lib/znc/configs/znc.conf
+  register: znc_config_file
+
+- name: Copy ZNC monit service config files into place
+  copy: src=etc_monit_conf.d_znc dest=/etc/monit/conf.d/znc
+  notify: restart monit
+  when: znc_config_file.stat.exists == True

site.yml

@@ -16,7 +16,6 @@
     - blog
     - ircbouncer
     - xmpp
-    - monitoring
     - owncloud
     - vpn
     - tarsnap
@@ -24,3 +23,4 @@
     - git
     - newebe
     - readlater
+    - monitoring  # Monitoring role should be last. See roles/monitoring/README.md