Fix Debian logrotate, closes #1510

- Remove the patch to scripts/logrotate/freeradius as it isn't
  anyway the file that the Debian package eventually installs.
- Instead apply the Debian-specific locations to debian/freeradius.logrotate
  so deb packages should now come with a working logrotate config.

diff --git a/debian/freeradius.logrotate b/debian/freeradius.logrotate
index 3c007cdfa419aac6d007ab7ad49a9be0b067efc5..02f95c0ee7cfcc3608d9f566069c915bb4924646 100644 (file)
--- a/debian/freeradius.logrotate
+++ b/debian/freeradius.logrotate
@@ -1,4 +1,4 @@
-# You can use this to rotate the /var/log/radius/* files, simply copy
+# You can use this to rotate the /var/log/freeradius/* files, simply copy
 # it to /etc/logrotate.d/radiusd
 
 #
@@ -14,28 +14,28 @@ notifempty
 #
 #  The main server log
 #
-/var/log/radius/radius.log {
+/var/log/freeradius/radius.log {
        copytruncate
 }
 
 #
 #  Session monitoring utilities
 #
-/var/log/radius/checkrad.log /var/log/radius/radwatch.log {
+/var/log/freeradius/checkrad.log /var/log/freeradius/radwatch.log {
        nocreate
 }
 
 #
 #  Session database modules
 #
-/var/log/radius/radutmp /var/log/radius/radwtmp {
+/var/log/freeradius/radutmp /var/log/freeradius/radwtmp {
        nocreate
 }
 
 #
 #  SQL log files
 #
-/var/log/radius/sqllog.sql {
+/var/log/freeradius/sqllog.sql {
        nocreate
 }
 
@@ -46,6 +46,6 @@ notifempty
 # (or similar) in radiusd.conf, without rotation.  If you go with the
 # second technique, you will need another cron job that removes old
 # detail files.  You do not need to comment out the below for method #2.
-/var/log/radius/radacct/*/detail {
+/var/log/freeradius/radacct/*/detail {
        nocreate
 }

diff --git a/debian/patches/logrotate-path.diff b/debian/patches/logrotate-path.diff
deleted file mode 100644 (file)
index 6d1871f..0000000
--- a/debian/patches/logrotate-path.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/scripts/logrotate/freeradius b/scripts/logrotate/freeradius
-index cbeeb5f..bfb8220 100644
---- a/scripts/logrotate/freeradius
-+++ b/scripts/logrotate/freeradius
-@@ -1,7 +1,7 @@
- #
- #  Sample logrotate file for FreeRADIUS
- #
--#  You can use this to rotate the /var/log/radius/* files, simply copy it to /etc/logrotate.d/radiusd
-+#  You can use this to rotate the /var/log/freeradius/* files, simply copy it to /etc/logrotate.d/radiusd
- #
- 
- #
-@@ -17,28 +17,28 @@ notifempty
- #
- #  The main server log
- #
--/var/log/radius/radius.log {
-+/var/log/freeradius/radius.log {
-       copytruncate
- }
- 
- #
- #  Session monitoring utilities
- #
--/var/log/radius/checkrad.log /var/log/radius/radwatch.log {
-+/var/log/freeradius/checkrad.log /var/log/freeradius/radwatch.log {
-       nocreate
- }
- 
- #
- #  Session database modules
- #
--/var/log/radius/radutmp /var/log/radius/radwtmp {
-+/var/log/freeradius/radutmp /var/log/freeradius/radwtmp {
-       nocreate
- }
- 
- #
- #  SQL log files
- #
--/var/log/radius/sqllog.sql {
-+/var/log/freeradius/sqllog.sql {
-       nocreate
- }
- 
-@@ -49,6 +49,6 @@ notifempty
- # (or similar) in radiusd.conf, without rotation.  If you go with the
- # second technique, you will need another cron job that removes old
- # detail files.  You do not need to comment out the below for method #2.
--/var/log/radius/radacct/*/detail {
-+/var/log/freeradius/radacct/*/detail {
-       nocreate
- }

diff --git a/debian/patches/series b/debian/patches/series
index 886c023689f246db740f71ab04755eca91eaed8d..893d2d1716b329254cf0d3cf4bc3d503b5cc9a32 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 radiusd-to-freeradius.diff
 disable-dhcp-bydefault.diff
-logrotate-path.diff