Merge lp:~brad-marshall/charms/trusty/nrpe-external-master/fix-rsyncd-conf into lp:charms/nrpe-external-master

[Brad Marshall]

Add support for a /etc/rsync-juju.d file, to allow charms to drop fragments in place. Required for the swift charm to have a working rsync.

[JuanJo Ciarlante (jjo)]

See inline comments, LGTM afterwards.

review: Needs Fixing

[lp:~brad-marshall/charms/trusty/nrpe-external-master/fix-rsyncd-conf]

36. By Brad Marshall on 2014-11-17

[bradm] Added timeout to rsyncd.conf

37. By Brad Marshall on 2014-11-17

[bradm] Removed puppet header from nagios_plugin module

38. By Brad Marshall on 2014-11-18

[bradm] Added nagios checks for monitoring upstart and sysvinit daemons

Unmerged revisions

=== added file 'files/rsyncd.conf'
--- files/rsyncd.conf	1970-01-01 00:00:00 +0000
+++ files/rsyncd.conf	2014-11-17 03:52:40 +0000
@@ -0,0 +1,12 @@
+#------------------------------------------------
+# This file is juju managed
+#------------------------------------------------
+
+uid = nobody
+gid = nogroup
+pid file = /var/run/rsyncd.pid
+syslog facility = daemon
+socket options = SO_KEEPALIVE
+timeout = 7200
+
+&include /etc/rsync-juju.d

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-10-08 05:42:32 +0000
+++ hooks/config-changed	2014-11-17 03:52:40 +0000
@@ -26,18 +26,9 @@
 export NAGIOS_ADDRESS_TYPE=$(config-get nagios_address_type)
 cheetah fill --env --oext compiled templates/nrpe.cfg.tmpl
 cp templates/nrpe.cfg.compiled /etc/nagios/nrpe.cfg
-if [[ -d /etc/rsyncd.d ]]; then
-    export RSYNC_MODULE_ONLY=1
-else
-    export RSYNC_MODULE_ONLY=0
-fi
 cheetah fill --env --oext compiled templates/rsyncd.conf.tmpl
-if [[ -d /etc/rsyncd.d ]]; then
-    cp templates/rsyncd.conf.compiled /etc/rsyncd.d/010-nrpe-external-master
-    concat_rsync_fragments || true
-else
-    cp templates/rsyncd.conf.compiled /etc/rsyncd.conf
-fi
+mkdir -p /etc/rsync-juju.d
+cp templates/rsyncd.conf.compiled /etc/rsync-juju.d/010-nrpe-external-master.conf
 
 #-----------------------------------------------------
 # Standard Checks

=== modified file 'hooks/install'
--- hooks/install	2014-03-11 13:57:58 +0000
+++ hooks/install	2014-11-17 03:52:40 +0000
@@ -15,17 +15,11 @@
 ln -fs /usr/lib/nagios/plugins/nagios_plugin.py /usr/local/lib/nagios/plugins/nagios_plugin.py
 
 cp files/default_rsync /etc/default/rsync
-if [[ -d /etc/rsyncd.d ]]; then
-    export RSYNC_MODULE_ONLY=1
-else
-    export RSYNC_MODULE_ONLY=0
-fi
+cp files/rsyncd.conf /etc/rsyncd.conf
+
 export NAGIOS_MASTER=$(config-get nagios_master)
 cheetah fill --env --oext compiled templates/rsyncd.conf.tmpl
-if [[ -d /etc/rsyncd.d ]]; then
-    cp templates/rsyncd.conf.compiled /etc/rsyncd.d/010-nrpe-external-master
-    concat_rsync_fragments || true
-else
-    cp templates/rsyncd.conf.compiled /etc/rsyncd.conf
-fi
+mkdir -p /etc/rsync-juju.d
+cp templates/rsyncd.conf.compiled /etc/rsync-juju.d/010-nrpe-external-master
+
 service rsync restart

=== modified file 'templates/rsyncd.conf.tmpl'
--- templates/rsyncd.conf.tmpl	2012-11-26 04:27:06 +0000
+++ templates/rsyncd.conf.tmpl	2014-11-17 03:52:40 +0000
@@ -1,16 +1,7 @@
-#if $RSYNC_MODULE_ONLY == "0"
 #------------------------------------------------------------
 # This file is managed by Juju.
 #------------------------------------------------------------
 
-uid = nobody
-gid = nogroup
-max connections = 25
-syslog facility = daemon
-socket options = SO_KEEPALIVE
-timeout = 7200
-#end if
-
 [external-nagios]
   path = /var/lib/nagios/export/
   comment = External Nagios Node configs