[arch-commits] Commit in munin/trunk (6 files)

[Dan McGee]

    Date: Saturday, September 15, 2012 @ 13:23:15
  Author: dan
Revision: 166688

upgpkg: munin 2.0.6-2

Add a bunch of systemd units for sockets and services

Added:
  munin/trunk/munin-graph.service
  munin/trunk/munin-graph.socket
  munin/trunk/munin-html.service
  munin/trunk/munin-html.socket
  munin/trunk/munin-node.service
Modified:
  munin/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   15 ++++++++++++++-
 munin-graph.service |   10 ++++++++++
 munin-graph.socket  |    9 +++++++++
 munin-html.service  |   10 ++++++++++
 munin-html.socket   |    9 +++++++++
 munin-node.service  |   11 +++++++++++
 6 files changed, 63 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-15 16:47:20 UTC (rev 166687)
+++ PKGBUILD	2012-09-15 17:23:15 UTC (rev 166688)
@@ -5,7 +5,7 @@
 pkgname=('munin' 'munin-node')
 pkgbase=munin
 pkgver=2.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A distributed monitoring/graphing tool"
 arch=('any')
 url="http://munin-monitoring.org/"
@@ -21,6 +21,9 @@
         logrotate.munin
         logrotate.munin-node
         munin.tmpfiles.conf
+        munin-node.service
+        munin-graph.{service,socket}
+        munin-html.{service,socket}
         08-munin-font-dir.conf)
 
 build() { 
@@ -45,6 +48,10 @@
 	install -D -m644 ../munin-cron-entry "$pkgdir"/etc/munin/munin-cron-entry
 	install -D -m644 ../logrotate.munin "$pkgdir"/etc/logrotate.d/munin
 	install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin.conf
+    install -D -m644 ../munin-graph.service "$pkgdir"/usr/lib/systemd/system/munin-graph.service
+    install -D -m644 ../munin-graph.socket "$pkgdir"/usr/lib/systemd/system/munin-graph.socket
+    install -D -m644 ../munin-html.service "$pkgdir"/usr/lib/systemd/system/munin-html.service
+    install -D -m644 ../munin-html.socket "$pkgdir"/usr/lib/systemd/system/munin-html.socket
 	install -D -m644 ../08-munin-font-dir.conf "$pkgdir"/etc/fonts/conf.d/08-munin-font-dir.conf
 	rm -rf "$pkgdir/run"
 }
@@ -63,6 +70,7 @@
 	install -D -m755 ../munin-node.init "$pkgdir"/etc/rc.d/munin-node
 	install -D -m644 ../logrotate.munin-node "$pkgdir"/etc/logrotate.d/munin-node
 	install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin-node.conf
+    install -D -m644 ../munin-node.service "$pkgdir"/usr/lib/systemd/system/munin-node.service
 	rm -rf "$pkgdir/run/"
 }
 
@@ -73,4 +81,9 @@
          'eb2f1e6e746e85ce1e91111f40086be0'
          'cdf139f2b6ae36852113f3411caa6e99'
          'd124f46e353a7966df093ba803235789'
+         '80afc4a85e2e87d8f1acf7a56d86a37f'
+         'd35937ab3442947f572024fce803cfd6'
+         'aa45d2c22a84725e6b1eae810f73c7c7'
+         '27144c961b6e4240f3a0554c7100b5f4'
+         '5ecdc62d4497ebb043803e6c35624f1d'
          'e33a45c3b80a83eecabbe5a9920c1eb6')

Added: munin-graph.service
===================================================================
--- munin-graph.service	                        (rev 0)
+++ munin-graph.service	2012-09-15 17:23:15 UTC (rev 166688)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Munin FastCGI Graph
+
+[Service]
+User=munin
+Group=munin
+ExecStart=/usr/share/munin/cgi/munin-cgi-graph
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal

Added: munin-graph.socket
===================================================================
--- munin-graph.socket	                        (rev 0)
+++ munin-graph.socket	2012-09-15 17:23:15 UTC (rev 166688)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Munin FastCGI Graph Socket
+
+[Socket]
+ListenStream=/run/munin/fcgi-graph.sock
+Accept=yes
+
+[Install]
+WantedBy=sockets.target

Added: munin-html.service
===================================================================
--- munin-html.service	                        (rev 0)
+++ munin-html.service	2012-09-15 17:23:15 UTC (rev 166688)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Munin FastCGI HTML
+
+[Service]
+User=munin
+Group=munin
+ExecStart=/usr/share/munin/cgi/munin-cgi-html
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal

Added: munin-html.socket
===================================================================
--- munin-html.socket	                        (rev 0)
+++ munin-html.socket	2012-09-15 17:23:15 UTC (rev 166688)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Munin FastCGI HTML Socket
+
+[Socket]
+ListenStream=/run/munin/fcgi-html.sock
+Accept=yes
+
+[Install]
+WantedBy=sockets.target

Added: munin-node.service
===================================================================
--- munin-node.service	                        (rev 0)
+++ munin-node.service	2012-09-15 17:23:15 UTC (rev 166688)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Munin Node Service
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/munin/munin-node.pid
+ExecStart=/usr/bin/munin-node
+
+[Install]
+WantedBy=multi-user.target