Merge branch 'release/debian/1.14-21'HEADdebian/1.14-21master

1 files changed, 0 insertions, 20 deletions

diff --git a/debian/patches/001_default-rrd-location.diff b/debian/patches/001_default-rrd-location.diff
index 54be53f..fa62f8c 100644
--- a/debian/patches/001_default-rrd-location.diff
+++ b/debian/patches/001_default-rrd-location.diff
@@ -16,23 +16,3 @@ Forwarded: not-needed
  
  my @graphs = (
  	{ title => 'Last Day',   seconds => 3600*24,        },
---- a/mailgraph.pl
-+++ b/mailgraph.pl
-@@ -373,7 +373,7 @@
- 
- my $daemon_logfile = '/var/log/mailgraph.log';
- my $daemon_pidfile = '/var/run/mailgraph.pid';
--my $daemon_rrd_dir = '/var/log';
-+my $daemon_rrd_dir = '/var/lib/mailgraph';
- 
- # global variables
- my $logfile;
-@@ -411,7 +411,7 @@
- 	print "      --host=HOST    use only entries for HOST (regexp) in syslog\n";
- 	print "  -d, --daemon       start in the background\n";
- 	print "  --daemon-pid=FILE  write PID to FILE instead of /var/run/mailgraph.pid\n";
--	print "  --daemon-rrd=DIR   write RRDs to DIR instead of /var/log\n";
-+	print "  --daemon-rrd=DIR   write RRDs to DIR instead of /var/lib/mailgraph\n";
- 	print "  --daemon-log=FILE  write verbose-log to FILE instead of /var/log/mailgraph.log\n";
- 	print "  --ignore-localhost ignore mail to/from localhost (used for virus scanner)\n";
- 	print "  --ignore-host=HOST ignore mail to/from HOST regexp (used for virus scanner)\n";