Merge lp:~brad-marshall/charms/trusty/rsyslog-forwarder/add-udp-listener into lp:charms/trusty/rsyslog-forwarder

[Brad Marshall]

Add a config option to set a UDP listener for rsyslog.

[lp:~brad-marshall/charms/trusty/rsyslog-forwarder/add-udp-listener]

12. By Brad Marshall on 2015-12-11

[bradm] Fixed bug with variable not being passed properly

13. By Brad Marshall on 2015-12-14

[bradm] Update listen-udp config description

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1854/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1834/

review: Approve (automated testing)

[Adam Israel (aisrael)]

Hi Brad,

Thanks for this merge proposal. Looks good to me! +1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2012-10-25 14:56:57 +0000
+++ config.yaml	2015-12-14 05:24:28 +0000
@@ -3,3 +3,7 @@
     type: boolean
     default: false
     description: Should logs be written locally as well as forwarded?
+  listen-udp:
+    type: boolean
+    default: false
+    description: Required to support UDP syslog clients.
 
=== added file 'files/listen_udp.template'
--- files/listen_udp.template	1970-01-01 00:00:00 +0000
+++ files/listen_udp.template	2015-12-14 05:24:28 +0000
@@ -0,0 +1,2 @@
+$ModLoad imudp
+$UDPServerRun 514
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2013-01-24 11:57:05 +0000
+++ hooks/config-changed	2015-12-14 05:24:28 +0000
@@ -9,4 +9,13 @@
 	rm -f /etc/rsyslog.d/81-local.conf
 fi
 
+listen_udp=`config-get listen-udp`
+listen_udp=${listen_udp,,}
+
+if [ "$listen_udp" == "true" ]; then
+	install -o root -g root -m 0644 files/listen_udp.template /etc/rsyslog.d/82-listen-udp.conf
+else
+	rm -f /etc/rsyslog.d/82-listen-udp.conf
+fi
+
 service rsyslog restart