summaryrefslogtreecommitdiff
path: root/puppet/modules/tapicero
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-04-15 16:12:11 -0700
committerelijah <elijah@riseup.net>2015-04-16 11:10:59 -0700
commitbb07407485ed1626221a1190cc2fb2789f95ed22 (patch)
tree0ab39a464ecacd637a3c2f2da652fdc05e970d23 /puppet/modules/tapicero
parent7f069dc47c318e9047a3ae7a29a90f3471610e34 (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/tapicero')
-rw-r--r--puppet/modules/tapicero/manifests/init.pp14
1 files changed, 1 insertions, 13 deletions
diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp
index d4ff1acb..ca8488c8 100644
--- a/puppet/modules/tapicero/manifests/init.pp
+++ b/puppet/modules/tapicero/manifests/init.pp
@@ -133,17 +133,5 @@ class tapicero {
Couchdb::Add_user[$::site_couchdb::couchdb_tapicero_user] ];
}
- rsyslog::snippet { '99-tapicero':
- content => 'if $programname startswith \'tapicero\' then /var/log/leap/tapicero.log
-&~'
- }
-
- augeas {
- 'logrotate_tapicero':
- context => '/files/etc/logrotate.d/tapicero/rule',
- changes => [ 'set file /var/log/leap/tapicero*.log', 'set rotate 7',
- 'set schedule daily', 'set compress compress',
- 'set missingok missingok', 'set ifempty notifempty',
- 'set copytruncate copytruncate' ]
- }
+ leap::logfile { 'tapicero': }
}