summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------puppet/modules/couchdb0
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp3
-rw-r--r--puppet/modules/leap_mx/manifests/syslog.pp17
3 files changed, 19 insertions, 1 deletions
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject 4c0d5673df02fe42e1bbadfee7d4ea1ca1f88e9
+Subproject 0fbe82d154d5dc7e4e56251bfdaf3b06563ee3e
diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index c90fc231..c2cc96c6 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -9,7 +9,8 @@ class leap_mx {
include soledad::common
include site_apt::preferences::twisted
-
+ include leap_mx::syslog
+
#
# USER AND GROUP
#
diff --git a/puppet/modules/leap_mx/manifests/syslog.pp b/puppet/modules/leap_mx/manifests/syslog.pp
new file mode 100644
index 00000000..0247a392
--- /dev/null
+++ b/puppet/modules/leap_mx/manifests/syslog.pp
@@ -0,0 +1,17 @@
+class leap_mx::syslog {
+
+ rsyslog::snippet { '99-leap-mx':
+ content => 'if $programname startswith \'leap-mx\' then /var/log/leap/mx.log
+&~'
+ }
+
+ augeas {
+ 'logrotate_leap-mx':
+ context => '/files/etc/logrotate.d/leap-mx/rule',
+ changes => [ 'set file /var/log/leap/mx*.log', 'set rotate 7',
+ 'set schedule daily', 'set compress compress',
+ 'set missingok missingok', 'set ifempty notifempty',
+ 'set copytruncate copytruncate' ]
+ }
+
+}