BeeSeek

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

  1. logrotate
  2. Merge into 1.0
Proposed by Andrea Corbellini
Status: Merged
Merged at revision: not available
Proposed branch: lp:~andrea.corbellini/beeseek/logrotate
Merge into: lp:beeseek/1.0
Diff against target: None lines
To merge this branch: bzr merge lp:~andrea.corbellini/beeseek/logrotate
Reviewer Review Type Date Requested Status
Andrea Colangelo Approve
Review via email: mp+10874@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrea Corbellini (andrea.corbellini) wrote :

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

Revision history for this message
Andrea Colangelo (warp10) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2009-08-28 13:32:45 +0000
3+++ Makefile 2009-08-29 17:53:21 +0000
4@@ -20,7 +20,8 @@
5 PLATFORM := $(shell uname -s | tr A-Z a-z)-$(shell uname -m)
6 PKGFILES := build/lib.$(PLATFORM)-$(PYVERSION)/beeseek \
7 build/scripts-$(PYVERSION)/beeseek-peer \
8- beeseek-peer.init config database templates setup.py
9+ config database templates beeseek-peer.init \
10+ beeseek-peer.logrotate setup.py
11 pyflakes_ignore := beeseek/tests/unittests/.*\.py.*(undefined name|imported but unused)
12
13 build: version-info
14@@ -44,11 +45,11 @@
15
16 tar.gz: dist/$(FULLNAME).tar.gz
17 dist/$(FULLNAME).tar.gz: tar
18- gzip -9 dist/$(FULLNAME).tar
19+ gzip -f9 dist/$(FULLNAME).tar
20
21 tar.bz2: dist/$(FULLNAME).tar.bz2
22 dist/$(FULLNAME).tar.bz2: tar
23- bzip2 -9 dist/$(FULLNAME).tar
24+ bzip2 -f9 dist/$(FULLNAME).tar
25
26 zip: dist/$(FULLNAME).zip
27 dist/$(FULLNAME).zip: dist
28
29=== added file 'beeseek-peer.logrotate'
30--- beeseek-peer.logrotate 1970-01-01 00:00:00 +0000
31+++ beeseek-peer.logrotate 2009-08-29 17:52:39 +0000
32@@ -0,0 +1,13 @@
33+/var/log/beeseek/*.log {
34+ rotate 6
35+ daily
36+ compress
37+ delaycompress
38+ sharedscripts
39+ missingok
40+ nocreate
41+
42+ postrotate
43+ beeseek-peer reopen-logs
44+ endscript
45+}
46
47=== modified file 'config/00default'
48--- config/00default 2009-08-23 19:12:47 +0000
49+++ config/00default 2009-08-29 17:52:21 +0000
50@@ -10,7 +10,7 @@
51
52 # The location of the log file. It defaults to /dev/null, so by default the
53 # log is not saved.
54-#LogFile = /var/log/beeseek.log
55+#LogFile = /var/log/beeseek/beeseek-peer.log
56
57 # When True, this option enables debug, runs the application in foreground and
58 # sets the database/web directories to subdirectories of the application path
59
60=== modified file 'setup.py'
61--- setup.py 2009-08-28 14:14:30 +0000
62+++ setup.py 2009-08-29 17:53:21 +0000
63@@ -47,13 +47,13 @@
64 dirs_map = {
65 'BeeSeek/config': 'config',
66 'BeeSeek/database': 'database',
67- 'BeeSeek/webdata': 'webdata'
68+ 'BeeSeek/webdata': 'webdata',
69 }
70 else:
71 dirs_map = {
72 'etc/beeseek': 'config',
73+ 'usr/share/beeseek/templates': 'templates',
74 'var/lib/beeseek/database': 'database',
75- 'usr/share/beeseek/templates': 'templates'
76 }
77
78 for destination, source in dirs_map.iteritems():
79@@ -73,6 +73,9 @@
80 self.mkpath(os.path.join(install_dir, 'etc/init.d'))
81 self.copy_file('beeseek-peer.init',
82 os.path.join(install_dir, 'etc/init.d/beeseek-peer'))
83+ self.mkpath(os.path.join(install_dir, 'etc/logrotate.d'))
84+ self.copy_file('beeseek-peer.logrotate',
85+ os.path.join(install_dir, 'etc/logrotate.d/beeseek-peer'))
86 self.mkpath(os.path.join(install_dir, 'var/log/beeseek'))
87
88 if not self.dry_run and pwd:

Subscribers

People subscribed via source and target branches