summaryrefslogtreecommitdiff
path: root/puppet/modules/tapicero
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-04-15 09:36:30 -0700
committerelijah <elijah@riseup.net>2015-04-15 09:36:30 -0700
commit7f069dc47c318e9047a3ae7a29a90f3471610e34 (patch)
tree125c73282aba7d5910b20883fa957f667b0adbe1 /puppet/modules/tapicero
parent00ff465519e2ac6d6c1b9beddbe5e51937d4825a (diff)
fix tapicero & webapp logs: remove heartbeat log check, move to /var/log/tapicero, fix webapp logwatch location.
Diffstat (limited to 'puppet/modules/tapicero')
-rw-r--r--puppet/modules/tapicero/manifests/init.pp31
1 files changed, 22 insertions, 9 deletions
diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp
index 8afb18b8..d4ff1acb 100644
--- a/puppet/modules/tapicero/manifests/init.pp
+++ b/puppet/modules/tapicero/manifests/init.pp
@@ -44,9 +44,9 @@ class tapicero {
file {
- ##
- ## TAPICERO DIRECTORIES
- ##
+ #
+ # TAPICERO DIRECTORIES
+ #
'/srv/leap/tapicero':
ensure => directory,
@@ -67,9 +67,9 @@ class tapicero {
group => 'tapicero',
require => User['tapicero'];
- ##
- ## TAPICERO CONFIG
- ##
+ #
+ # TAPICERO CONFIG
+ #
'/etc/leap/tapicero.yaml':
content => template('tapicero/tapicero.yaml.erb'),
@@ -78,9 +78,9 @@ class tapicero {
mode => '0600',
notify => Service['tapicero'];
- ##
- ## TAPICERO INIT
- ##
+ #
+ # TAPICERO INIT
+ #
'/etc/init.d/tapicero':
source => 'puppet:///modules/tapicero/tapicero.init',
@@ -133,4 +133,17 @@ 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' ]
+ }
}