Merge lp:~andrea.corbellini/beeseek/logrotate into lp:beeseek/1.0

[Andrea Corbellini]

[Andrea Corbellini (andrea.corbellini)]

This branch adds a logrotate configuration file for BeeSeek. It needs to be reviewed to check if it is policy-compilant.

[Andrea Colangelo (warp10)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2009-08-28 13:32:45 +0000
+++ Makefile	2009-08-29 17:53:21 +0000
@@ -20,7 +20,8 @@
 PLATFORM := $(shell uname -s | tr A-Z a-z)-$(shell uname -m)
 PKGFILES := build/lib.$(PLATFORM)-$(PYVERSION)/beeseek \
             build/scripts-$(PYVERSION)/beeseek-peer \
-            beeseek-peer.init config database templates setup.py
+            config database templates beeseek-peer.init \
+            beeseek-peer.logrotate setup.py
 pyflakes_ignore := beeseek/tests/unittests/.*\.py.*(undefined name|imported but unused)
 
 build: version-info
@@ -44,11 +45,11 @@
 
 tar.gz: dist/$(FULLNAME).tar.gz
 dist/$(FULLNAME).tar.gz: tar
-	gzip -9 dist/$(FULLNAME).tar
+	gzip -f9 dist/$(FULLNAME).tar
 
 tar.bz2: dist/$(FULLNAME).tar.bz2
 dist/$(FULLNAME).tar.bz2: tar
-	bzip2 -9 dist/$(FULLNAME).tar
+	bzip2 -f9 dist/$(FULLNAME).tar
 
 zip: dist/$(FULLNAME).zip
 dist/$(FULLNAME).zip: dist
 
=== added file 'beeseek-peer.logrotate'
--- beeseek-peer.logrotate	1970-01-01 00:00:00 +0000
+++ beeseek-peer.logrotate	2009-08-29 17:52:39 +0000
@@ -0,0 +1,13 @@
+/var/log/beeseek/*.log {
+    rotate 6
+    daily
+    compress
+    delaycompress
+    sharedscripts
+    missingok
+    nocreate
+
+    postrotate
+        beeseek-peer reopen-logs
+    endscript
+}
 
=== modified file 'config/00default'
--- config/00default	2009-08-23 19:12:47 +0000
+++ config/00default	2009-08-29 17:52:21 +0000
@@ -10,7 +10,7 @@
 
 # The location of the log file. It defaults to /dev/null, so by default the
 # log is not saved.
-#LogFile = /var/log/beeseek.log
+#LogFile = /var/log/beeseek/beeseek-peer.log
 
 # When True, this option enables debug, runs the application in foreground and
 # sets the database/web directories to subdirectories of the application path
 
=== modified file 'setup.py'
--- setup.py	2009-08-28 14:14:30 +0000
+++ setup.py	2009-08-29 17:53:21 +0000
@@ -47,13 +47,13 @@
             dirs_map = {
                 'BeeSeek/config': 'config',
                 'BeeSeek/database': 'database',
-                'BeeSeek/webdata': 'webdata'
+                'BeeSeek/webdata': 'webdata',
             }
         else:
             dirs_map = {
                'etc/beeseek': 'config',
+               'usr/share/beeseek/templates': 'templates',
                'var/lib/beeseek/database': 'database',
-               'usr/share/beeseek/templates': 'templates'
             }
 
         for destination, source in dirs_map.iteritems():
@@ -73,6 +73,9 @@
             self.mkpath(os.path.join(install_dir, 'etc/init.d'))
             self.copy_file('beeseek-peer.init',
                 os.path.join(install_dir, 'etc/init.d/beeseek-peer'))
+            self.mkpath(os.path.join(install_dir, 'etc/logrotate.d'))
+            self.copy_file('beeseek-peer.logrotate',
+                os.path.join(install_dir, 'etc/logrotate.d/beeseek-peer'))
             self.mkpath(os.path.join(install_dir, 'var/log/beeseek'))
 
         if not self.dry_run and pwd: