diff options
| author | elijah <elijah@riseup.net> | 2015-04-15 16:12:11 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-04-16 11:10:59 -0700 |
| commit | bb07407485ed1626221a1190cc2fb2789f95ed22 (patch) | |
| tree | 0ab39a464ecacd637a3c2f2da652fdc05e970d23 /puppet/modules/leap_mx | |
| parent | 7f069dc47c318e9047a3ae7a29a90f3471610e34 (diff) | |
clean up logging mess: add 'logfile' define, mv openvpn and stunnel logs to their own files, fix mx logwatch path.
Diffstat (limited to 'puppet/modules/leap_mx')
| -rw-r--r-- | puppet/modules/leap_mx/manifests/init.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/leap_mx/manifests/syslog.pp | 17 |
2 files changed, 2 insertions, 18 deletions
diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp index 78065f56..a0590ee1 100644 --- a/puppet/modules/leap_mx/manifests/init.pp +++ b/puppet/modules/leap_mx/manifests/init.pp @@ -11,7 +11,8 @@ class leap_mx { include soledad::common include site_apt::preferences::twisted - include leap_mx::syslog + + leap::logfile { 'mx': process => 'leap-mx'} # # USER AND GROUP diff --git a/puppet/modules/leap_mx/manifests/syslog.pp b/puppet/modules/leap_mx/manifests/syslog.pp deleted file mode 100644 index 0247a392..00000000 --- a/puppet/modules/leap_mx/manifests/syslog.pp +++ /dev/null @@ -1,17 +0,0 @@ -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' ] - } - -} |