From 56894c6c513d4b60091b5ac65a1afc8f4dff85d5 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Thu, 11 Oct 2012 11:10:05 -0500 Subject: certmaster, lighttpd,linhes-scripts,linhes-system,mythtv,xymon: fix logrotation --- abs/core/LinHES-system/PKGBUILD | 6 +++--- abs/core/LinHES-system/myth_mtc.lr | 2 +- abs/core/certmaster/PKGBUILD | 4 ++-- abs/core/certmaster/logrotate-certmaster.conf | 3 ++- abs/core/lighttpd/PKGBUILD | 4 ++-- abs/core/lighttpd/__changelog | 3 +++ abs/core/lighttpd/lighttpd.logrotate.d | 1 + abs/core/linhes-scripts/PKGBUILD | 16 +++++++++------- abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 6 ++++-- abs/core/xymon/PKGBUILD | 4 ++-- abs/core/xymon/logrotate-client.xymon | 4 ++-- abs/core/xymon/logrotate-server.xymon | 4 ++-- 12 files changed, 33 insertions(+), 24 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index ef6bf08..46eb48a 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -65,8 +65,8 @@ build() { # install -m755 -D $startdir/src/smolt.cron $startdir/pkg/etc/cron.weekly/smolt.cron install -m755 -D $startdir/src/cacheclean.cron $startdir/pkg/etc/cron.weekly/cacheclean.cron install -m755 -D $startdir/src/diskspace $startdir/pkg/etc/cron.tenminutes/diskspace - mkdir $startdir/pkg/etc/logrotate.d - cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d + install -m644 -D $startdir/src/myth_mtc.lr $startdir/pkg/etc/logrotate.d/myth_mtc + #sudo rules mkdir -p $startdir/pkg/etc/sudoers.d/ @@ -113,7 +113,7 @@ md5sums=('5bd4938cf41b63787aa4cdfd76423e09' '0ca244610ab1f68f70a8af0ddefee277' 'bacc813b48bafcc6fe906e5969930501' 'eb879fee9603a05d5420d4ce8ed9e450' - 'f1870a9522c79e6b248fcbf81dec3280' + '6782771960c495aeb597893f37d1e5ee' '84492954db16740f949d795b74383189' '02c810c2f47b7c4495fdacaf54189473' '1e2ca4dd872a50df6b70528e06df558a' diff --git a/abs/core/LinHES-system/myth_mtc.lr b/abs/core/LinHES-system/myth_mtc.lr index 23f8711..2b2fbba 100644 --- a/abs/core/LinHES-system/myth_mtc.lr +++ b/abs/core/LinHES-system/myth_mtc.lr @@ -1,7 +1,7 @@ /var/log/mythtv/myth_mtc.log { copytruncate daily - size 10M + #size 1M missingok rotate 7 compress diff --git a/abs/core/certmaster/PKGBUILD b/abs/core/certmaster/PKGBUILD index ccb85fa..0c2bb91 100644 --- a/abs/core/certmaster/PKGBUILD +++ b/abs/core/certmaster/PKGBUILD @@ -22,7 +22,7 @@ build() { cd $startdir/src install -m755 -D minion.conf $startdir/pkg/etc/certmaster/minion.conf install -m755 -D certmaster.conf $startdir/pkg/etc/certmaster/certmaster.conf - install -m755 -D logrotate-certmaster.conf $startdir/pkg/etc/logrotate.d/certmaster.conf + install -m644 -D logrotate-certmaster.conf $startdir/pkg/etc/logrotate.d/certmaster mkdir -p $startdir/pkg/var/log/certmaster cd $startdir/pkg find ./usr/bin/* -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \; @@ -31,4 +31,4 @@ build() { md5sums=('f5acc9ff1efa34971296e26d794c5b35' '953ff601e5381b457383e7a3c4928192' 'be7bd532ae103ab3c0048980314b4fd9' - '6bc28ccd331a6c4c05e0a9c9755a848f') + 'fa8fabe2381c7b891e014bf9e23e653b') diff --git a/abs/core/certmaster/logrotate-certmaster.conf b/abs/core/certmaster/logrotate-certmaster.conf index 39c3537..e4637a2 100644 --- a/abs/core/certmaster/logrotate-certmaster.conf +++ b/abs/core/certmaster/logrotate-certmaster.conf @@ -2,7 +2,8 @@ missingok notifempty rotate 4 - weekly + size 512k + compress postrotate if [ -f /service/certmaster ]; then sv restart certmaster diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD index 98f5215..809f82f 100644 --- a/abs/core/lighttpd/PKGBUILD +++ b/abs/core/lighttpd/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lighttpd pkgver=1.4.28 -pkgrel=4 +pkgrel=5 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -77,6 +77,6 @@ package() { } md5sums=('586eb535d31ac299652495b058dd87c4' 'bd690eee0d9e51857448770a151023b0' - '857e174643fd7761a2f0d8431a679f6c' + 'e17a29ebcdac82a853389c3df468c980' '1857cb0c145db64e2a5f54b79a144adb' 'c6e361131000ceec085f40b310ef4a2c') diff --git a/abs/core/lighttpd/__changelog b/abs/core/lighttpd/__changelog index 375590d..3c412af 100644 --- a/abs/core/lighttpd/__changelog +++ b/abs/core/lighttpd/__changelog @@ -1,6 +1,9 @@ changed docroot to /data/srv/ modified auth to require valid user (include auth-inc.conf) +logrotate: +missingok + # by mihanson: upgraded to 1.4.26 to address http://linhes.org/flyspray/index.php?do=details&task_id=624 Added -e 's|"^/mythweb|"^/{1,2}mythweb|' \ to the sed command to work around lighttpd no longer honoring // in a url and/or to work around mythweb producing url's with a // for streaming and downloading. diff --git a/abs/core/lighttpd/lighttpd.logrotate.d b/abs/core/lighttpd/lighttpd.logrotate.d index 15cacc9..71c5191 100644 --- a/abs/core/lighttpd/lighttpd.logrotate.d +++ b/abs/core/lighttpd/lighttpd.logrotate.d @@ -1,4 +1,5 @@ /var/log/lighttpd/*log { + missingok postrotate /bin/kill -HUP `cat /var/run/lighttpd/lighttpd.pid 2>/dev/null` 2> /dev/null || true endscript diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index 4d851d8..ce2a8d8 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=46 +pkgrel=47 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -66,7 +66,9 @@ build() { mkdir -p ${pkgdir}/etc/sv/limit-mythcommflag/supervise cp run-limit-mythcommflag ${pkgdir}/etc/sv/limit-mythcommflag/run mkdir -p ${pkgdir}/etc/logrotate.d/ - cp pause_mythcommflag ${pkgdir}/etc/logrotate.d/ +# cp pause_mythcommflag ${pkgdir}/etc/logrotate.d/ + install -m644 -D pause_mythcommflag $startdir/pkg/etc/logrotate.d/pause_mythcommflag + } md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' '10ad1a4da669adccd01e0be6e5e4a3ed' @@ -77,15 +79,15 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' 'f8df7665903ddf822f5148bc8a074e4a' '18263972b6326e140bbef0bb7dfa2da9' '410795ef9039e4c6c0484e706ecfd567' - '0750d7c65109d12aa536f312a38410d1' + 'ad98d51e79f83df7c03f828dbeaea7f4' 'ac2a4a6b4100f4d7bfb9ecd9356c8c6e' 'd2b475821f902c5e081e7da43a35e6ac' '95c092f67036a361ef7a57436f44332e' - '565ebca7b88bcd083322b7324f8e56e5' + '92950f0ffb1faf1ed64c6be2b8fbc3f6' '3b776bbff68906ddc2f62b7e0dde3fe4' - '15f3143d2b1369da431e4268029aba40' + 'a57641fb63d7bb6d92a438f1ea779a57' '3d0adf26280cde55a0c47188fff34826' - '25dd5b8ec0482d561b481bfce051d648' + 'c3ada01d3a739abe3f920b02d4ea3f6e' 'b2c3dd48a4abb976eda2d5fbf22a173a' 'b527b01d119d3bc33b8fa69bdf1082bb' '9d077c24d102fa02e4f417d639d8b00a' @@ -106,6 +108,6 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' '34fc1f58ad1eabf4eff4979d420760c0' 'cc9cdabcdfc969c2829b58c0e513488c' '54a478660d0f8150fe10112a9ecf2740' - 'bb8eae5de8a0d22f1722b3e7b2e32468' + '503df99218373dfc75e7e7f5e449a44e' 'b608044c9e7530a400d8f5b88fdfe6e6' 'e2e24dd59d5d576cc33feafb329fa302') diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index c173e20..8937416 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -136,8 +136,10 @@ package() { # make log dir mkdir -p ${pkgdir}/var/log/mythtv chown 1000.1000 ${pkgdir}/var/log/mythtv - mkdir -p ${pkgdir}/etc/logrotate.d - cp ${srcdir}/*.lr ${pkgdir}/etc/logrotate.d + + install -m644 -D $srcdir/mythfrontend.lr $startdir/pkg/etc/logrotate.d/mythfrontend + install -m644 -D $srcdir/mythbackend.lr $startdir/pkg/etc/logrotate.d/mythbackend + mkdir -p ${pkgdir}/etc/cron.hourly/ install -m0755 ${srcdir}/pretty ${pkgdir}/etc/cron.hourly/ } diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index a03e135..91f1256 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -131,8 +131,8 @@ md5sums=('31923ec126fe1c264fceb459d2175161' '622f400fd098cbc43c203e3210a6694e' '84442377c6e914b65519076bda4e17a4' '388dbe22d97198af0cd0bf1d18e96ce5' - 'f6ff1fb4bacee930007b877424619b30' - 'c6b43daf66228952fcd0bad5daf45500' + '67621b6c5a766ac03c5f407bdbdca810' + '7ad4871af35f82c7824bb682b9325dba' '98e9242ae346f729b14cb195786571f2' '31ac5c1f6dcc9408b64c4107b325a9a6' 'c7178bbf384bbe86c318b60fef6faf10' diff --git a/abs/core/xymon/logrotate-client.xymon b/abs/core/xymon/logrotate-client.xymon index ac6ff61..a312b64 100644 --- a/abs/core/xymon/logrotate-client.xymon +++ b/abs/core/xymon/logrotate-client.xymon @@ -1,7 +1,7 @@ /home/xymon/client/logs/* { missingok - daily - rotate 2 + size 512K + rotate 0 compress postrotate if [ -f /service/xymon-client/run ] diff --git a/abs/core/xymon/logrotate-server.xymon b/abs/core/xymon/logrotate-server.xymon index e69c5d9..2267da8 100644 --- a/abs/core/xymon/logrotate-server.xymon +++ b/abs/core/xymon/logrotate-server.xymon @@ -1,7 +1,7 @@ /var/log/hobbit/* { missingok - daily - rotate 2 + size 512K + rotate 0 compress postrotate if [ -f /service/xymon-server/run ] -- cgit v0.12