Merge lp:~jjo/charms/precise/rsyslog-forwarder/fix-config-changed-and-other-mv-usages into lp:charms/rsyslog-forwarder

[JuanJo Ciarlante]

[Robert Ayres (robert-ayres)]

review: Approve

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-10-25 14:56:57 +0000
+++ hooks/config-changed	2013-01-24 12:12:22 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-keep_logs=`config-changed log-locally`
+keep_logs=`config-get log-locally`
 keep_logs=${keep_logs,,}
 
 if [ "$keep_logs" == "true" ]; then

=== modified file 'hooks/syslog-relation-departed'
--- hooks/syslog-relation-departed	2012-04-17 19:39:09 +0000
+++ hooks/syslog-relation-departed	2013-01-24 12:12:22 +0000
@@ -6,6 +6,6 @@
 
 rm -f /etc/rsyslog.d/80-$JUJU_RELATION_ID.conf
 
-[ ! -f /etc/rsyslog.d/50-default.conf.off ] || mv -f /etc/rsyslog.d/50-default.conf.off /etc/rsyslog.d/50-default.conf
+[ -f /etc/rsyslog.d/50-default.conf.off ] && mv -f /etc/rsyslog.d/50-default.conf{.off,}
 
 service rsyslog restart

=== modified file 'hooks/syslog-relation-joined'
--- hooks/syslog-relation-joined	2012-04-17 19:39:09 +0000
+++ hooks/syslog-relation-joined	2013-01-24 12:12:22 +0000
@@ -4,7 +4,7 @@
 
 rservice=${JUJU_REMOTE_UNIT%%/*}
 
-mv -f /etc/rsyslog.d/50-default.conf /etc/rsyslog.d/50-default.conf.off
+[ -f /etc/rsyslog.d/50-default.conf ] && mv -f /etc/rsyslog.d/50-default.conf{,.off}
 
 sed -e "s/@@server@@/@@`relation-get private-address`/g;
         s/@@service@@/$rservice/g" \

=== modified file 'revision'
--- revision	2012-04-17 19:39:09 +0000
+++ revision	2013-01-24 12:12:22 +0000
@@ -1,1 +1,1 @@
-8
+9