diff options
| author | Julien Valroff <julien@kirya.net> | 2011-03-08 21:00:56 +0100 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2011-03-08 21:00:56 +0100 |
| commit | 3afe1b82ef3f34f9301301fcdb9deb8dcd395f60 (patch) | |
| tree | 781dd6034914efe141f876ae50d0e57a89f38fd6 | |
| parent | e907368672043aff78262eecbc0b744ecb04b2f1 (diff) | |
Fix patch to set default location of rrd files
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/001_default-rrd-location.diff | 34 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 41 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index c4c85a6..de6d117 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mailgraph (1.14-9) unstable; urgency=low + + * Fix patch to set default location of rrd files (Closes: #617411) + + -- Julien Valroff <julien@debian.org> Tue, 08 Mar 2011 21:00:23 +0100 + mailgraph (1.14-8) unstable; urgency=low * Add patch from Malte S. Stretz to replace rrdtool badge by a simple diff --git a/debian/patches/001_default-rrd-location.diff b/debian/patches/001_default-rrd-location.diff new file mode 100644 index 0000000..e971e1c --- /dev/null +++ b/debian/patches/001_default-rrd-location.diff @@ -0,0 +1,34 @@ +Description: Set path to rrd files to /var/lib/mailgraph/ +Forwarded: not-needed + +--- a/mailgraph.cgi ++++ b/mailgraph.cgi +@@ -18,7 +18,7 @@ + my $ypoints_err = 96; + my $rrd = 'mailgraph.rrd'; # path to where the RRD database is + my $rrd_virus = 'mailgraph_virus.rrd'; # path to where the Virus RRD database is +-my $tmp_dir = '/tmp/mailgraph'; # temporary directory where to store the images ++my $tmp_dir = '/var/lib/mailgraph'; # temporary directory where to store the images + + 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"; diff --git a/debian/patches/series b/debian/patches/series index d5835d9..e07de45 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -001_path-to-rrd.diff +001_default-rrd-location.diff 002_script-name.diff 003_web-bug.diff 101_dspam-virus-notifications.diff |