diff --git a/ChangeLog b/ChangeLog index 03159f886..dabe280d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-07-23 Jean Raby + * debian*/sogo.logrotate: + drop distro specific log rotate scripts + * debian*/sogo.install + * debian*/rules : + Use the logrotate script from Scripts/. + 2012-07-20 Ludovic Marcotte * UI/MailPartViewers/UIxMailRenderingContext.m diff --git a/debian-multiarch/rules b/debian-multiarch/rules index d66269b96..6f06fb1ac 100755 --- a/debian-multiarch/rules +++ b/debian-multiarch/rules @@ -80,13 +80,13 @@ install-arch: build-arch mkdir -p debian/tmp/etc/apache2/conf.d cp Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf install -D -m 644 Scripts/sogo.cron debian/tmp/etc/cron.d/sogo + install -D -m 644 Scripts/logrotate debian/tmp/etc/logrotate.d/sogo # Build architecture dependant packages using the common target. binary-arch: build-arch install-arch dh_testdir dh_testroot dh_installinit -R - dh_installlogrotate dh_installcron dh_installchangelogs ChangeLog dh_installdocs diff --git a/debian-multiarch/sogo.install b/debian-multiarch/sogo.install index 8a55c7961..44d947d4f 100644 --- a/debian-multiarch/sogo.install +++ b/debian-multiarch/sogo.install @@ -1,6 +1,7 @@ etc/default/sogo etc/apache2/conf.d/SOGo.conf etc/cron.d/sogo +etc/logrotate.d/sogo usr/sbin/* usr/lib/GNUstep/Frameworks/* usr/lib/GNUstep/Libraries/* diff --git a/debian-multiarch/sogo.logrotate b/debian-multiarch/sogo.logrotate deleted file mode 100644 index 2e8b28fd8..000000000 --- a/debian-multiarch/sogo.logrotate +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/sogo/*.log { - daily - missingok - rotate 7 - compress - delaycompress - notifempty - create 640 sogo sogo - sharedscripts - postrotate - /etc/init.d/sogo restart > /dev/null 2>&1 - endscript -} diff --git a/debian/rules b/debian/rules index cfa64de7b..b3b41ce65 100755 --- a/debian/rules +++ b/debian/rules @@ -79,13 +79,13 @@ install-arch: build-arch mkdir -p debian/tmp/etc/apache2/conf.d cp Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf install -D -m 644 Scripts/sogo.cron debian/tmp/etc/cron.d/sogo + install -D -m 644 Scripts/logrotate debian/tmp/etc/logrotate.d/sogo # Build architecture dependant packages using the common target. binary-arch: build-arch install-arch dh_testdir dh_testroot dh_installinit -R - dh_installlogrotate dh_installcron dh_installchangelogs ChangeLog dh_installdocs diff --git a/debian/sogo.install b/debian/sogo.install index 8a55c7961..44d947d4f 100644 --- a/debian/sogo.install +++ b/debian/sogo.install @@ -1,6 +1,7 @@ etc/default/sogo etc/apache2/conf.d/SOGo.conf etc/cron.d/sogo +etc/logrotate.d/sogo usr/sbin/* usr/lib/GNUstep/Frameworks/* usr/lib/GNUstep/Libraries/* diff --git a/debian/sogo.logrotate b/debian/sogo.logrotate deleted file mode 100644 index 2e8b28fd8..000000000 --- a/debian/sogo.logrotate +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/sogo/*.log { - daily - missingok - rotate 7 - compress - delaycompress - notifempty - create 640 sogo sogo - sharedscripts - postrotate - /etc/init.d/sogo restart > /dev/null 2>&1 - endscript -}