[arch-commits] Commit in mailgraph/repos/community-any (4 files)

[Florian Pritz]

    Date: Monday, December 29, 2014 @ 21:10:07
  Author: bluewind
Revision: 124873

archrelease: copy trunk to community-any

Added:
  mailgraph/repos/community-any/PKGBUILD
    (from rev 124872, mailgraph/trunk/PKGBUILD)
  mailgraph/repos/community-any/mailgraph.service
    (from rev 124872, mailgraph/trunk/mailgraph.service)
Deleted:
  mailgraph/repos/community-any/PKGBUILD
  mailgraph/repos/community-any/mailgraph.service

-------------------+
 PKGBUILD          |   68 ++++++++++++++++++++++++++--------------------------
 mailgraph.service |   17 +++++++------
 2 files changed, 44 insertions(+), 41 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-29 20:10:04 UTC (rev 124872)
+++ PKGBUILD	2014-12-29 20:10:07 UTC (rev 124873)
@@ -1,34 +0,0 @@
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: lp76 <l.peduto at gmail.com>
-pkgname=mailgraph
-pkgver=1.14
-pkgrel=3
-pkgdesc="A very simple mail statistics RRDtool frontend for Postfix and Sendmail"
-url="http://mailgraph.schweikert.ch/"
-arch=('any')
-license=('GPL')
-options=(emptydirs)
-depends=('rrdtool' 'perl-file-tail' 'syslog-ng')
-source=("http://mailgraph.schweikert.ch/pub/$pkgname-$pkgver.tar.gz"
-mailgraph.service)
-md5sums=('0f0ae91968ea7ae0c1d14985c560530b'
-         '0517acd06d86112806fd9ac81c2d6e0e')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i "s:mailgraph.rrd:/var/lib/mailgraph/mailgraph.rrd:" mailgraph.cgi
-  sed -i "s:mailgraph_virus.rrd:/var/lib/mailgraph/mailgraph_virus.rrd:" mailgraph.cgi
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  #CGI_DIR=`grep 'ScriptAlias /cgi-bin/' /etc/httpd/conf/httpd.conf | awk '{print $3}' | sed 's|"||g'`
-  CGI_DIR="/usr/share/webapps/mailgraph"
-
-  install -D -m755 mailgraph.pl "$pkgdir/usr/bin/mailgraph.pl"
-  install -D -m755 mailgraph.cgi "$pkgdir/$CGI_DIR/mailgraph.cgi"
-  install -D -m755 mailgraph.css "$pkgdir/$CGI_DIR/mailgraph.css"
-  install -D -m644 "$srcdir/mailgraph.service" "$pkgdir/usr/lib/systemd/system/mailgraph.service"
-  install -d -m755 "$pkgdir/var/lib/mailgraph"
-}

Copied: mailgraph/repos/community-any/PKGBUILD (from rev 124872, mailgraph/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-12-29 20:10:07 UTC (rev 124873)
@@ -0,0 +1,34 @@
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: lp76 <l.peduto at gmail.com>
+pkgname=mailgraph
+pkgver=1.14
+pkgrel=4
+pkgdesc="A very simple mail statistics RRDtool frontend for Postfix and Sendmail"
+url="http://mailgraph.schweikert.ch/"
+arch=('any')
+license=('GPL')
+options=(emptydirs)
+depends=('rrdtool' 'perl-file-tail')
+source=("http://mailgraph.schweikert.ch/pub/$pkgname-$pkgver.tar.gz"
+mailgraph.service)
+md5sums=('0f0ae91968ea7ae0c1d14985c560530b'
+         '92d411ab7f14083a77faa07b2ade653f')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i "s:mailgraph.rrd:/var/lib/mailgraph/mailgraph.rrd:" mailgraph.cgi
+  sed -i "s:mailgraph_virus.rrd:/var/lib/mailgraph/mailgraph_virus.rrd:" mailgraph.cgi
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  #CGI_DIR=`grep 'ScriptAlias /cgi-bin/' /etc/httpd/conf/httpd.conf | awk '{print $3}' | sed 's|"||g'`
+  CGI_DIR="/usr/share/webapps/mailgraph"
+
+  install -D -m755 mailgraph.pl "$pkgdir/usr/bin/mailgraph.pl"
+  install -D -m755 mailgraph.cgi "$pkgdir/$CGI_DIR/mailgraph.cgi"
+  install -D -m755 mailgraph.css "$pkgdir/$CGI_DIR/mailgraph.css"
+  install -D -m644 "$srcdir/mailgraph.service" "$pkgdir/usr/lib/systemd/system/mailgraph.service"
+  install -d -m755 "$pkgdir/var/lib/mailgraph"
+}

Deleted: mailgraph.service
===================================================================
--- mailgraph.service	2014-12-29 20:10:04 UTC (rev 124872)
+++ mailgraph.service	2014-12-29 20:10:07 UTC (rev 124873)
@@ -1,7 +0,0 @@
-[Service]
-ExecStart=/usr/bin/mailgraph.pl -l /var/log/everything.log --daemon-rrd /var/lib/mailgraph
-# FIXME: doesn't work
-#ExecStart=/bin/bash -c '/usr/bin/journalctl -af | /usr/bin/mailgraph.pl -c -l -'
-
-[Install]
-WantedBy=multi-user.target

Copied: mailgraph/repos/community-any/mailgraph.service (from rev 124872, mailgraph/trunk/mailgraph.service)
===================================================================
--- mailgraph.service	                        (rev 0)
+++ mailgraph.service	2014-12-29 20:10:07 UTC (rev 124873)
@@ -0,0 +1,10 @@
+[Service]
+SyslogIdentifier=mailgraph
+
+# if you use syslog instead of journald
+#ExecStart=/usr/bin/mailgraph.pl -l /var/log/everything.log --daemon-rrd /var/lib/mailgraph
+ExecStart=/bin/bash -c 'LANG=C /usr/bin/journalctl -af | /usr/bin/mailgraph.pl -c --daemon-rrd /var/lib/mailgraph -l -'
+
+
+[Install]
+WantedBy=multi-user.target