Merge branch 'master' into release

7 files changed, 17 insertions, 68 deletions

diff --git a/tools/conf/etc/logrotate.d/dnsmasq b/tools/conf/etc/logrotate.d/dnsmasq
deleted file mode 100644
index 3151ddc..0000000
--- a/tools/conf/etc/logrotate.d/dnsmasq
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/dnsmasq {
-    weekly
-    create 0644 root root
-    rotate 5
-    sharedscripts
-    postrotate
-    if [ -f /var/run/syslog-ng.pid ]; then \
-    	kill -HUP `cat /var/run/syslog-ng.pid`; \
-    fi;
-    endscript
-}
diff --git a/tools/conf/etc/logrotate.d/gitolite b/tools/conf/etc/logrotate.d/gitolite
deleted file mode 100644
index 547d6b6..0000000
--- a/tools/conf/etc/logrotate.d/gitolite
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/gitolite {
-    rotate 5
-    monthly
-    create 0644 root root
-    sharedscripts
-    postrotate
-    if [ -f /var/run/syslog-ng.pid ]; then \
-    	kill -HUP `cat /var/run/syslog-ng.pid`; \
-    fi;
-    endscript
-
-}
diff --git a/tools/conf/etc/logrotate.d/letsencrypt b/tools/conf/etc/logrotate.d/letsencrypt
new file mode 100644
index 0000000..ce73ebc
--- /dev/null
+++ b/tools/conf/etc/logrotate.d/letsencrypt
@@ -0,0 +1,7 @@
+/var/log/letsencrypt/*.log {
+    # uncomment this if you want your log files compressed
+    delaycompress
+    compress
+    olddir /var/log/old/letsencrypt
+    notifempty
+}
diff --git a/tools/conf/etc/logrotate.d/nginx b/tools/conf/etc/logrotate.d/nginx
deleted file mode 100644
index ae05445..0000000
--- a/tools/conf/etc/logrotate.d/nginx
+++ /dev/null
@@ -1,23 +0,0 @@
-/var/log/nginx/access.log {
-    weekly
-    create 0664 root www
-    rotate 5
-    sharedscripts
-    postrotate
-    if [ -f /var/run/syslog-ng.pid ]; then \
-    	kill -HUP `cat /var/run/syslog-ng.pid`; \
-    fi;
-    endscript
-}
-
-/var/log/nginx/error.log {
-    weekly
-    create 0644 root root
-    rotate 5
-    sharedscripts
-    postrotate
-    if [ -f /var/run/syslog-ng.pid ]; then \
-    	kill -HUP `cat /var/run/syslog-ng.pid`; \
-    fi;
-    endscript
-}
diff --git a/tools/conf/etc/logrotate.d/php-fpm b/tools/conf/etc/logrotate.d/php-fpm
deleted file mode 100644
index c778658..0000000
--- a/tools/conf/etc/logrotate.d/php-fpm
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/php-fpm.log {
-    rotate 5
-    monthly
-    create 0644 root root
-}
diff --git a/tools/conf/etc/logrotate.d/postgres b/tools/conf/etc/logrotate.d/postgres
deleted file mode 100644
index fc59aad..0000000
--- a/tools/conf/etc/logrotate.d/postgres
+++ /dev/null
@@ -1,17 +0,0 @@
-/var/log/pgsql {
-    weekly
-    compress
-    delaycompress
-    rotate 10
-    notifempty
-    create 660 postgres postgres
-    sharedscripts
-    postrotate
-    if [ -f /var/run/syslog-ng.pid ]; then \
-    	kill -HUP `cat /var/run/syslog-ng.pid`; \
-    fi;
-    endscript
-
-}
-
-
diff --git a/tools/conf/etc/logrotate.d/postgresql b/tools/conf/etc/logrotate.d/postgresql
new file mode 100644
index 0000000..8c16bfa
--- /dev/null
+++ b/tools/conf/etc/logrotate.d/postgresql
@@ -0,0 +1,10 @@
+# this log is only used by postgresql at startup
+# before start using syslog so there is no need
+# to reload syslog-ng or syslog-ng
+/var/log/postgresql {
+    # uncomment this if you want your log files compressed
+    delaycompress
+    compress
+    notifempty
+    create 664 postgres postgres
+}