summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorirregulator <irregulator@riseup.net>2014-05-24 19:26:05 +0300
committerelijah <elijah@riseup.net>2014-07-01 16:05:41 -0700
commitdb9290a2b1b406e8231c0df569ae47c0a74ec12a (patch)
treef1825d6109c29d45f7d64cd3e90cd3346f98790c /puppet
parent58347eddee416410e3ad3c8c4edc2b0e40a3d26c (diff)
Move log files to var/log instead of var/log/obfsproxy
Diffstat (limited to 'puppet')
-rwxr-xr-xpuppet/modules/obfsproxy/files/obfsproxy_init2
-rw-r--r--puppet/modules/obfsproxy/files/obfsproxy_logrotate2
-rw-r--r--puppet/modules/obfsproxy/manifests/init.pp12
3 files changed, 8 insertions, 8 deletions
diff --git a/puppet/modules/obfsproxy/files/obfsproxy_init b/puppet/modules/obfsproxy/files/obfsproxy_init
index b1297738..629fea9f 100755
--- a/puppet/modules/obfsproxy/files/obfsproxy_init
+++ b/puppet/modules/obfsproxy/files/obfsproxy_init
@@ -19,7 +19,7 @@ USER=obfsproxy
DATDIR=/etc/obfsproxy
PIDFILE=/var/run/obfsproxy.pid
CONF=$DATDIR/obfsproxy.conf
-LOGFILE=/var/log/obfsproxy/log
+LOGFILE=/var/log/obfsproxy.log
# If the daemon is not there, then exit.
test -x $DAEMON || exit 0
diff --git a/puppet/modules/obfsproxy/files/obfsproxy_logrotate b/puppet/modules/obfsproxy/files/obfsproxy_logrotate
index e776fcd3..e5679d0c 100644
--- a/puppet/modules/obfsproxy/files/obfsproxy_logrotate
+++ b/puppet/modules/obfsproxy/files/obfsproxy_logrotate
@@ -1,4 +1,4 @@
-/var/log/obfsproxy/log {
+/var/log/obfsproxy.log {
daily
missingok
rotate 3
diff --git a/puppet/modules/obfsproxy/manifests/init.pp b/puppet/modules/obfsproxy/manifests/init.pp
index 4a0221af..9750932f 100644
--- a/puppet/modules/obfsproxy/manifests/init.pp
+++ b/puppet/modules/obfsproxy/manifests/init.pp
@@ -48,11 +48,11 @@ class obfsproxy (
mode => '0700',
}
- file { '/var/log/obfsproxy':
- ensure => directory,
- owner => $user,
- group => $user,
- mode => '0750',
+ file { '/var/log/obfsproxy.log':
+ ensure => present,
+ owner => $user,
+ group => $user,
+ mode => '0640',
}
file { '/etc/logrotate.d/obfsproxy':
@@ -61,7 +61,7 @@ class obfsproxy (
owner => 'root',
group => 'root',
mode => '0644',
- require => File['/var/log/obfsproxy'],
+ require => File['/var/log/obfsproxy.log'],
}
package { 'obfsproxy':