Revision: 6693
http://ipcop.svn.sourceforge.net/ipcop/?rev=6693&view=rev
Author: owes
Date: 2012-07-08 16:12:34 +0000 (Sun, 08 Jul 2012)
Log Message:
-----------
debian patches location of statefile to /var/lib/logrotate/status.
Configuration option maxsize, helpfull for our flash installation.
Modified Paths:
--------------
ipcop/trunk/config/logrotate/logrotate.conf.FLASH
ipcop/trunk/config/rootfiles/common/logrotate
ipcop/trunk/lfs/logrotate
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/setup
Modified: ipcop/trunk/config/logrotate/logrotate.conf.FLASH
===================================================================
--- ipcop/trunk/config/logrotate/logrotate.conf.FLASH 2012-07-08 09:02:57 UTC
(rev 6692)
+++ ipcop/trunk/config/logrotate/logrotate.conf.FLASH 2012-07-08 16:12:34 UTC
(rev 6693)
@@ -15,7 +15,7 @@
create
# Maximum logfile size of 4MB
-size 4M
+maxsize 4M
# uncomment this if you want your log files compressed
compress
Modified: ipcop/trunk/config/rootfiles/common/logrotate
===================================================================
--- ipcop/trunk/config/rootfiles/common/logrotate 2012-07-08 09:02:57 UTC
(rev 6692)
+++ ipcop/trunk/config/rootfiles/common/logrotate 2012-07-08 16:12:34 UTC
(rev 6693)
@@ -10,4 +10,5 @@
usr/sbin/logrotate
#usr/share/man/man5/logrotate.conf.5
#usr/share/man/man8/logrotate.8
-var/lib/logrotate.status
+#var/lib/logrotate
+var/lib/logrotate/status
Modified: ipcop/trunk/lfs/logrotate
===================================================================
--- ipcop/trunk/lfs/logrotate 2012-07-08 09:02:57 UTC (rev 6692)
+++ ipcop/trunk/lfs/logrotate 2012-07-08 16:12:34 UTC (rev 6693)
@@ -97,7 +97,9 @@
endif
cd $(DIR_APP) && make install
- touch /var/lib/logrotate.status
+ # debian patches location of statefile to /var/lib/logrotate/status
+ mkdir -p /var/lib/logrotate
+ touch /var/lib/logrotate/status
cp -fR $(DIR_SRC)/config/logrotate/* /etc
find /etc/logrotate.d -name .svn -print | xargs --no-run-if-empty rm -rf
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-08 09:02:57 UTC
(rev 6692)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-08 16:12:34 UTC
(rev 6693)
@@ -1,5 +1,6 @@
## please place IPCop files first, then packages sorted by alphabetical order
/etc/httpd/conf/httpd.conf
+/etc/logrotate.conf.FLASH
/etc/rc.d/rc.sysinit
/etc/rc.d/rc.updatered
/etc/sysctl.conf
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-07-08 09:02:57 UTC (rev 6692)
+++ ipcop/trunk/updates/2.1.0/setup 2012-07-08 16:12:34 UTC (rev 6693)
@@ -37,6 +37,12 @@
# Can't replace dnsmasq whilst active
/etc/rc.d/rc.dnsmasq --stop
+# logrotate state file has moved location
+if [ ! -e /var/lib/logrotate/status ]; then
+ mkdir -p /var/lib/logrotate
+ mv /var/lib/logrotate.status /var/lib/logrotate/status
+fi
+
# Show urlfilter/redirector section in proxy page
if [ ! -e /var/ipcop/proxy/redirector/urlfilter ]; then
echo "ENABLED=off" > /var/ipcop/proxy/redirector/urlfilter
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
