[Pkg-sks-commit] r117 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 15:01:32 +0000 (Thu, 19 Jun 2008)
New Revision: 117

Added:
   sks/trunk/sks/debian/patches/510_sane_logfile_names
   sks/trunk/sks/debian/sks.logrotate
Modified:
   sks/trunk/sks/debian/rules
   sks/trunk/sks/debian/sks.init
Log:
[project @ 118]
Have sane logfile names and rotate logs

Original author: weasel
Date: 2004-03-06 21:23:30.874281+00:00

Added: sks/trunk/sks/debian/patches/510_sane_logfile_names
===================================================================
--- sks/trunk/sks/debian/patches/510_sane_logfile_names	                        (rev 0)
+++ sks/trunk/sks/debian/patches/510_sane_logfile_names	2008-06-19 15:01:32 UTC (rev 117)
@@ -0,0 +1,12 @@
+diff -ruN sks-1.0.6-old/common.ml sks-1.0.6/common.ml
+--- sks-1.0.6-old/common.ml	Sat Mar  6 22:06:25 2004
++++ sks-1.0.6/common.ml	Sat Mar  6 22:07:23 2004
+@@ -81,7 +81,7 @@
+ 
+ let set_logfile extension = 
+   if !Settings.filelog then
+-    let fname = (Filename.concat !Settings.basedir "/var/log/sks/log") ^ extension in
++    let fname = (Filename.concat !Settings.basedir "/var/log/sks/sks") ^ extension ^ ".log" in
+     stored_logfile_name := Some fname;
+     logfile := open_out_gen [ Open_wronly; Open_creat; Open_append; ] 
+       0o600 fname;

Modified: sks/trunk/sks/debian/rules
===================================================================
--- sks/trunk/sks/debian/rules	2008-06-19 15:01:20 UTC (rev 116)
+++ sks/trunk/sks/debian/rules	2008-06-19 15:01:32 UTC (rev 117)
@@ -52,6 +52,7 @@
 	dh_strip
 	dh_shlibdeps
 	dh_installdebconf
+	dh_installlogrotate
 	dh_installinit
 	dh_installcron
 	dh_installdeb

Modified: sks/trunk/sks/debian/sks.init
===================================================================
--- sks/trunk/sks/debian/sks.init	2008-06-19 15:01:20 UTC (rev 116)
+++ sks/trunk/sks/debian/sks.init	2008-06-19 15:01:32 UTC (rev 117)
@@ -95,7 +95,23 @@
 	echo " done."
 
     ;;
-    reload|restart|force-reload)
+    reload)
+	# Hupping at least reopens logfiles.
+	# membership and mailsync are regularily read anyway
+	# not sure about the rest
+	#    -- weasel
+	echo -n "Reloading sks daemons:"
+	echo -n " sksrecon.."
+	start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile $SKSRECONPID
+	wait_for_deaddaemon $SKSRECONPID || exit 1
+
+	echo -n " sksdb.."
+	start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile $SKSDBPID
+	wait_for_deaddaemon $SKSDBPID || exit 1
+
+	echo " done."
+    ;;
+    restart|force-reload)
 	$0 stop
 	sleep 1
 	$0 start

Added: sks/trunk/sks/debian/sks.logrotate
===================================================================
--- sks/trunk/sks/debian/sks.logrotate	                        (rev 0)
+++ sks/trunk/sks/debian/sks.logrotate	2008-06-19 15:01:32 UTC (rev 117)
@@ -0,0 +1,11 @@
+/var/log/sks/log {
+	daily
+	rotate 5
+	compress
+	delaycompress
+	missingok
+	notifempty
+	postrotate
+		/etc/init.d/sks reload > /dev/null
+	endscript
+}