rpms/queuegraph/devel queuegraph-average.patch, NONE, 1.1 queuegraph-paths.patch, NONE, 1.1 queuegraph.conf, NONE, 1.1 queuegraph.cron, NONE, 1.1 queuegraph.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Bernard Johnson (bjohnson)
fedora-extras-commits at redhat.com
Tue Mar 27 17:07:40 UTC 2007
Author: bjohnson
Update of /cvs/extras/rpms/queuegraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12152/devel
Modified Files:
.cvsignore sources
Added Files:
queuegraph-average.patch queuegraph-paths.patch
queuegraph.conf queuegraph.cron queuegraph.spec
Log Message:
auto-import queuegraph-1.1-1 on branch devel from queuegraph-1.1-1.src.rpm
queuegraph-average.patch:
--- NEW FILE queuegraph-average.patch ---
--- queuegraph/queuegraph/queuegraph-rrd.sh.orig 2007-02-12 02:37:40.000000000 -0700
+++ queuegraph/queuegraph/queuegraph-rrd.sh 2007-03-25 23:07:38.000000000 -0600
@@ -27,7 +27,7 @@
$RRDTOOL create $RRDFILE --step 60 \
DS:active:GAUGE:900:0:U \
DS:deferred:GAUGE:900:0:U \
- RRA:AVERAGE:0.5:1:20160 \
+ RRA:AVERAGE:0.5:1:1440 \
RRA:AVERAGE:0.5:30:2016 \
RRA:AVERAGE:0.5:60:105120 \
RRA:MAX:0.5:1:1440 \
queuegraph-paths.patch:
--- NEW FILE queuegraph-paths.patch ---
--- quegraph/queuegraph/queuegraph-rrd.sh.orig 2007-02-12 02:37:40.000000000 -0700
+++ quegraph/queuegraph/queuegraph-rrd.sh 2007-03-25 21:06:32.000000000 -0600
@@ -14,7 +14,7 @@
# change this to the location of rrdtool
RRDTOOL=/usr/bin/rrdtool
# change this to the location you want to store the rrd
-RRDFILE=/etc/postfix/mailqueues.rrd
+RRDFILE=/var/lib/queuegraph/mailqueues.rrd
if test ! -x $RRDTOOL ; then
echo "ERROR: $RRDTOOL does not exist or is not executable"
--- queuegraph/queuegraph.cgi.orig 2005-10-24 03:27:09.000000000 -0600
+++ queuegraph/queuegraph.cgi 2007-03-25 21:53:38.000000000 -0600
@@ -16,8 +16,8 @@
my $points_per_sample = 3;
my $ypoints = 160;
my $ypoints_err = 80;
-my $rrd = '/etc/postfix/mailqueues.rrd'; # path to where the RRD database is
-my $tmp_dir = '/tmp/queuegraph'; # temporary directory where to store the images
+my $rrd = '/var/lib/queuegraph/mailqueues.rrd'; # path to where the RRD database is
+my $tmp_dir = '/var/cache/queuegraph'; # temporary directory where to store the images
my $rrdtool_1_0 = ($RRDs::VERSION < 1.199908);
my @graphs = (
@@ -132,7 +132,6 @@
$uri =~ s/\/[^\/]+$//;
$uri =~ s/\//,/g;
$uri =~ s/\~/tilde,/g;
- mkdir $tmp_dir, 0777 unless -d $tmp_dir;
mkdir "$tmp_dir/$uri", 0777 unless -d "$tmp_dir/$uri";
my $file = "$tmp_dir/$uri$ENV{PATH_INFO}";
if($ENV{PATH_INFO} =~ /^\/queuegraph_(\d+)\.png$/) {
--- queuegraph/queuegraph/queuegraph-rrd.sh.orig 2007-02-12 02:37:40.000000000 -0700
+++ queuegraph/queuegraph/queuegraph-rrd.sh 2007-03-26 00:48:14.000000000 -0600
@@ -36,7 +36,7 @@
fi
#set -x
-qdir=`postconf -h queue_directory`
+qdir=`/usr/sbin/postconf -h queue_directory`
active=`find $qdir/incoming $qdir/active $qdir/maildrop -type f -print | wc -l | awk '{print $1}'`
deferred=`find $qdir/deferred -type f -print | wc -l | awk '{print $1}'`
#printf "active: %d\ndeferred: %d\n" $active $deferred
--- NEW FILE queuegraph.conf ---
#
# Queuegraph: An postfix/sendmail queue analyzer
#
Alias /queuegraph /usr/share/queuegraph
<Directory /usr/share/queuegraph/>
AllowOverride None
Options +ExecCGI
DirectoryIndex queuegraph.cgi
Order Deny,Allow
Deny from all
Allow from 127.0.0.1
</Directory>
--- NEW FILE queuegraph.cron ---
# Runs the queuegraph update program
#
# This will run every one minute
* * * * * root /usr/sbin/queuegraph-rrd.sh &> /dev/null
--- NEW FILE queuegraph.spec ---
Name: queuegraph
Version: 1.1
Release: 1%{?dist}%{?repotag:.%{repotag}}
Summary: A RRDtool frontend for Mail statistics
Group: System Environment/Daemons
License: GPL
URL: http://www.arschkrebs.de/postfix/queuegraph/
Source0: http://www.arschkrebs.de/postfix/queuegraph/queuegraph.tar.gz
Source1: queuegraph.conf
Source2: queuegraph.cron
Patch0: queuegraph-paths.patch
Patch1: queuegraph-average.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rrdtool, httpd, vixie-cron
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch
%description
Queuegraph is a very simple mail statistics RRDtool frontend for Postfix that
produces daily, weekly, monthly and yearly graphs of Postfix's active,
deferred, incoming and bounce queues.
%prep
%setup -q -c queuegraph
%patch0 -p1 -b .paths
%patch1 -p1 -b .average
%build
%install
rm -rf $RPM_BUILD_ROOT
%{__install} -d -m 0755 $RPM_BUILD_ROOT/%{_sbindir}
%{__install} -d -m 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
%{__install} -d -m 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d
%{__install} -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/queuegraph
%{__install} -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/queuegraph
%{__install} -d -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/cache/queuegraph
%{__install} -p -m 0755 queuegraph.cgi $RPM_BUILD_ROOT/%{_datadir}/queuegraph/queuegraph.cgi
%{__install} -p -m 0755 queuegraph/queuegraph-rrd.sh $RPM_BUILD_ROOT/%{_sbindir}/
%{__install} -p -m 0644 %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
%{__install} -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/queuegraph
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc queuegraph/README
%dir %{_localstatedir}/lib/queuegraph
%dir %attr(0775,root,apache) %{_localstatedir}/cache/queuegraph
%config(noreplace) %{_sysconfdir}/httpd/conf.d/queuegraph.conf
%config(noreplace) %{_sysconfdir}/cron.d/queuegraph
%{_sbindir}/*
%{_datadir}/queuegraph
%changelog
* Sun Mar 25 2007 Bernard Johnson <bjohnson at symetrix.com> - 1.1-1
- initial release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/queuegraph/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 Mar 2007 13:14:30 -0000 1.1
+++ .cvsignore 27 Mar 2007 17:07:06 -0000 1.2
@@ -0,0 +1 @@
+queuegraph.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/queuegraph/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 Mar 2007 13:14:30 -0000 1.1
+++ sources 27 Mar 2007 17:07:06 -0000 1.2
@@ -0,0 +1 @@
+2e0c78563cef4fb3195b06e9ee102264 queuegraph.tar.gz
More information about the fedora-extras-commits
mailing list