diff options
| author | Julien Valroff <julien@kirya.net> | 2011-03-13 08:15:05 +0100 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2011-03-13 08:15:05 +0100 |
| commit | d7b40e5247376aab389e2b69926a301cc2730db4 (patch) | |
| tree | 052cad619af9780a46423233f2de7b8822ca122c | |
| parent | 3afe1b82ef3f34f9301301fcdb9deb8dcd395f60 (diff) | |
Fix previous commit
| -rw-r--r-- | debian/patches/001_default-rrd-location.diff | 10 | ||||
| -rw-r--r-- | debian/patches/001_path-to-rrd.diff | 31 |
2 files changed, 7 insertions, 34 deletions
diff --git a/debian/patches/001_default-rrd-location.diff b/debian/patches/001_default-rrd-location.diff index e971e1c..54be53f 100644 --- a/debian/patches/001_default-rrd-location.diff +++ b/debian/patches/001_default-rrd-location.diff @@ -3,11 +3,15 @@ Forwarded: not-needed --- a/mailgraph.cgi +++ b/mailgraph.cgi -@@ -18,7 +18,7 @@ +@@ -16,9 +16,9 @@ + my $points_per_sample = 3; + my $ypoints = 160; 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 $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 $rrd = '/var/lib/mailgraph/mailgraph.rrd'; # path to where the RRD database is ++my $rrd_virus = '/var/lib/mailgraph/mailgraph_virus.rrd'; # path to where the Virus RRD database is +my $tmp_dir = '/var/lib/mailgraph'; # temporary directory where to store the images my @graphs = ( diff --git a/debian/patches/001_path-to-rrd.diff b/debian/patches/001_path-to-rrd.diff deleted file mode 100644 index 442ea58..0000000 --- a/debian/patches/001_path-to-rrd.diff +++ /dev/null @@ -1,31 +0,0 @@ -Description: Set path to rrd files to /var/lib/mailgraph/ -Forwarded: not-needed - ---- a/mailgraph.cgi -+++ b/mailgraph.cgi -@@ -16,9 +16,9 @@ - my $points_per_sample = 3; - my $ypoints = 160; - 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 $rrd = '/var/lib/mailgraph/mailgraph.rrd'; # path to where the RRD database is -+my $rrd_virus = '/var/lib/mailgraph/mailgraph_virus.rrd'; # path to where the Virus RRD database is -+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 -@@ -377,8 +377,8 @@ - - # global variables - my $logfile; --my $rrd = "mailgraph.rrd"; --my $rrd_virus = "mailgraph_virus.rrd"; -+my $rrd = "/var/lib/mailgraph/mailgraph.rrd"; -+my $rrd_virus = "/var/lib/mailgraph/mailgraph_virus.rrd"; - my $year; - my $this_minute; - my %sum = ( sent => 0, received => 0, bounced => 0, rejected => 0, virus => 0, spam => 0 ); |