From db9290a2b1b406e8231c0df569ae47c0a74ec12a Mon Sep 17 00:00:00 2001
From: irregulator <irregulator@riseup.net>
Date: Sat, 24 May 2014 19:26:05 +0300
Subject: Move log files to var/log instead of var/log/obfsproxy

---
 puppet/modules/obfsproxy/files/obfsproxy_init      |  2 +-
 puppet/modules/obfsproxy/files/obfsproxy_logrotate |  2 +-
 puppet/modules/obfsproxy/manifests/init.pp         | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'puppet')

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':
-- 
cgit v1.2.3