From 7a54923591125894440b9ff7020e4b413a1c6fb5 Mon Sep 17 00:00:00 2001
From: irregulator <irregulator@riseup.net>
Date: Fri, 23 May 2014 17:28:32 +0300
Subject: Address logging for obfsproxy daemon

Create obfsproxy directory in /var/log, specify log file when
obfsproxy is spawned by init script, create a logrotate
configuration for obfsproxy's logs.
---
 puppet/modules/obfsproxy/files/obfsproxy_logrotate | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 puppet/modules/obfsproxy/files/obfsproxy_logrotate

(limited to 'puppet/modules/obfsproxy/files/obfsproxy_logrotate')

diff --git a/puppet/modules/obfsproxy/files/obfsproxy_logrotate b/puppet/modules/obfsproxy/files/obfsproxy_logrotate
new file mode 100644
index 00000000..623bbab1
--- /dev/null
+++ b/puppet/modules/obfsproxy/files/obfsproxy_logrotate
@@ -0,0 +1,14 @@
+/var/log/obfsproxy/log {
+  weekly
+  missingok
+  rotate 10
+  compress
+  delaycompress
+  notifempty
+  create 600 obfsproxy obfsproxy
+  postrotate
+    if [ -f /var/run/obfsproxy.pid ]; then
+      /etc/init.d/obfsproxy restart > /dev/null
+    fi
+  endscript
+}
-- 
cgit v1.2.3


From 49c4235477ab11118f8fc92a6f554b36121b36b2 Mon Sep 17 00:00:00 2001
From: irregulator <irregulator@riseup.net>
Date: Sat, 24 May 2014 16:39:29 +0300
Subject: Change logrotate's frequency and number of log files to keep

---
 puppet/modules/obfsproxy/files/obfsproxy_logrotate | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/obfsproxy/files/obfsproxy_logrotate')

diff --git a/puppet/modules/obfsproxy/files/obfsproxy_logrotate b/puppet/modules/obfsproxy/files/obfsproxy_logrotate
index 623bbab1..e776fcd3 100644
--- a/puppet/modules/obfsproxy/files/obfsproxy_logrotate
+++ b/puppet/modules/obfsproxy/files/obfsproxy_logrotate
@@ -1,7 +1,7 @@
 /var/log/obfsproxy/log {
-  weekly
+  daily
   missingok
-  rotate 10
+  rotate 3
   compress
   delaycompress
   notifempty
-- 
cgit v1.2.3


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_logrotate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/obfsproxy/files/obfsproxy_logrotate')

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