[sys-cluster/ganglia_jobmonarch] Import per bug #297587

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key F82F92E6)

7 files changed, 307 insertions, 0 deletions

diff --git a/sys-cluster/ganglia_jobmonarch/Manifest b/sys-cluster/ganglia_jobmonarch/Manifest
new file mode 100644
index 000000000..acd46ad59
--- /dev/null
+++ b/sys-cluster/ganglia_jobmonarch/Manifest
@@ -0,0 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ganglia_jobmonarch-0.3.1-fix.patch 6715 RMD160 007a82d5706106eacc73c7e1fe9dd663efc9e125 SHA1 1cf8de76fedf35bd9125c4d429d3c4cdc11bc212 SHA256 2cc9887dcf6bc418a29a6bf1b8d9ca1c15455c3426ec921c288006cb7a86cc1a
+AUX job_monarch_link.sh 2932 RMD160 eb65a06ae33306c62190b023b05a0e552156ac66 SHA1 90d21fbf79cbf6bca4b079066426eccb5eb84671 SHA256 0f7ed9181d7881f7c065f432ef62ed10c0860a89c18f29fe2db2194d14f7b83d
+AUX jobarchived.initd 534 RMD160 f2a54dd08ef8c13ddc5a91aa6359980dabce7b1d SHA1 6d95bd5b32a94c520c780ca6d9f7839b066818d4 SHA256 b7f2a402db538db74c4ed85b85c372db1d15a564e0ffc9d38636996aef46d03f
+AUX jobmond.initd 514 RMD160 4b05109aded899a3aa61dd4c39b3784bf1dc5d4b SHA1 7090273827ebe4064a7f766ab06046377346cfe9 SHA256 567c67b64c22a4fbb7991c574d2afe446afff9c5f676923f69b48c2f48459935
+DIST ganglia_jobmonarch-0.3.1.tar.bz2 113717 RMD160 9078550c4812dd5e55a4feae14a01e80a0b71d8a SHA1 cc40abe15d11dbe51c60ea23999614299813b77f SHA256 606911b14c367dd44ce2e180d88876b5fe6db006d4cec9d9ab9556c597e909c3
+EBUILD ganglia_jobmonarch-0.3.1.ebuild 1702 RMD160 aaacec86f111b2ac048cd7827df059f66903cba2 SHA1 7bb7515c7aed9b59f4009f2731536051a09496a4 SHA256 802300191b086286cad136c055b1e66ec94bd8ffee29ddb92587b643708b2a8b
+MISC metadata.xml 162 RMD160 7800bf5ae6a087834e11dd1332107aa7ed5b0655 SHA1 dea0332aadbc22ba6bad0fc9cb993c6633e08d02 SHA256 ba8ac4b0fbb2acb09677330e980feed7de66b52d6ec4ee0ff9e44cccea58fa7c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOC2XxAAoJEOf+E+/4L5Lm4poP/1U02YckhckC6Xj9+RCLb8sc
+570ypmWMK1CcE9S9EHUSwEVoEid/C7dcAJXk5W6GpaxPatAwhXNdO8FxdsseYU2v
+nEu3tJtbTyMGk8qZG1tgv1cfKOC3xmUwkc3DJ82wKKNr5E7Ig86Z6QurqLZIxGEQ
+Ctbolkll3WFV3U7VmuNkoq8iWrS8iNBc42orDqmhJsP0pJxEZcgPlnBvr9YnISrd
+HMtR0gNEn0eyn7U23d5s3xfwJs5TeFFB+6a47XJKzLyWcGXeTD9aUh63czuEdlXA
+LseVK0NOibAFhSXFjr5T8vwC/8eanAkjEkONJ0SEp0pbIwdWPhjnHUnutxGIIXOf
+4z5vfp9OaALkcCxNug/xFTnG8f3aVlHfGB72HCFoq1DdFwMf2OicZ6Jph51UDCyc
+Z6Vv2Jw8pbiC77yPJuApUFxW88ve3+GPwh0slSsm9OF+vD7/5j4Kxol3mNvT0Cey
+z4oVZ9dGP7j0LzF72Ya1HdHEUA5oRt9OoNgFMhY21oC9nnfBt6gkIg2EEgI5qiLv
+3yYnTjaY5kYk3l2wXJXuG1NJaMrPmphZXDUnxgRkFCPBSEjBVGyLP25Awh8fZIb1
+lAhPo5NcY3LdJG86nLzNPddzHZdONNZb2+LtaZA0hbcWYpCLjPuvRs3WmoQssyIZ
+axUBN4QLNhZAEkhvXTE4
+=jn9x
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia_jobmonarch/files/ganglia_jobmonarch-0.3.1-fix.patch b/sys-cluster/ganglia_jobmonarch/files/ganglia_jobmonarch-0.3.1-fix.patch
new file mode 100644
index 000000000..e23b12aed
--- /dev/null
+++ b/sys-cluster/ganglia_jobmonarch/files/ganglia_jobmonarch-0.3.1-fix.patch
@@ -0,0 +1,79 @@
+diff -Naur ganglia_jobmonarch-0.3.1/web/addons/job_monarch/host_view.php ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/host_view.php                   
+--- ganglia_jobmonarch-0.3.1/web/addons/job_monarch/host_view.php       2007-07-06 17:05:08.000000000 +0200                                                  
++++ ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/host_view.php   2008-04-14 19:47:12.000000000 +0200                                                  
+@@ -73,8 +73,8 @@                                                                                                                                            
+        $trd = new TarchRrdGraph( $clustername, $hostname );                                                                                                 
+        $rrdirs = $trd->getRrdDirs( $period_start, $period_stop );                                                                                           
+                                                                                                                                                             
+-       $longtitle = "Batch Archive Node Report :: Powered by Job Monarch!";                                                                                 
+-       $title = "Batch Archive Node Report";                                                                                                                
++       $longtitle = "Host Node";                                                                                                                            
++       $title = "Host Node";                                                                                                                                
+                                                                                                                                                             
+        makeHeader( 'host_view', $title, $longtitle );                                                                                                       
+                                                                                                                                                             
+diff -Naur ganglia_jobmonarch-0.3.1/web/addons/job_monarch/libtoga.php ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/libtoga.php                       
+--- ganglia_jobmonarch-0.3.1/web/addons/job_monarch/libtoga.php 2008-02-28 09:33:32.000000000 +0100                                                          
++++ ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/libtoga.php     2008-04-16 20:09:11.000000000 +0200                                                  
+@@ -1433,7 +1433,7 @@                                                                                                                                        
+                                //                                                                                                                           
+                                $colorblue      = imageColorAllocate( $image, 0, 0, 255 );                                                                   
+                                                                                                                                                             
+-                               imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );                            
++                               imageString( $image, $font, 2, 2, "Joblist - cluster: ".$this->clustername, $colorblue );                                    
+                        }                                                                                                                                    
+                                                                                                                                                             
+                        if( $this->isBig() && ( isset( $SORT_XLABEL ) || isset( $SORT_YLABEL ) ) )                                                           
+@@ -1583,7 +1583,7 @@
+
+                                $colorblue      = imageColorAllocate( $image, 0, 0, 255 );
+
+-                               imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );
++                               imageString( $image, $font, 2, 2, "Joblist - cluster: ".$this->clustername, $colorblue );
+                        }
+
+                        for( $n = 0; $n < $node_rows; $n++ ) {
+@@ -1810,7 +1810,7 @@
+
+                $colorblue      = imageColorAllocate( $this->image, 0, 0, 255 );
+
+-               imageString( $this->image, $this->font, 1, $this->y_offset, "Monarch Joblist - host: ".$this->host, $colorblue );
++               imageString( $this->image, $this->font, 1, $this->y_offset, "Joblist - host: ".$this->host, $colorblue );
+                $this->newLineOffset();
+
+                $this->drawHeader();
+diff -Naur ganglia_jobmonarch-0.3.1/web/addons/job_monarch/search.php ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/search.php
+--- ganglia_jobmonarch-0.3.1/web/addons/job_monarch/search.php  2007-07-06 17:06:44.000000000 +0200
++++ ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/search.php      2008-04-14 19:53:38.000000000 +0200
+@@ -261,8 +261,8 @@
+        //printf("start = %s stop = %s\n", $start, $stop );
+        //printf("m %s\n", $metricname );
+
+-       $longtitle = "Batch Archive Search :: Powered by Job Monarch!";
+-       $title = "Batch Archive Search";
++       $longtitle = "Archive Search";
++       $title = "Archive Search";
+
+        makeHeader( 'search', $title, $longtitle );
+
+diff -Naur ganglia_jobmonarch-0.3.1/web/addons/job_monarch/templates/header.tpl ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/templates/header.tpl
+--- ganglia_jobmonarch-0.3.1/web/addons/job_monarch/templates/header.tpl        2007-04-23 19:17:40.000000000 +0200
++++ ganglia_jobmonarch-0.3.1-new/web/addons/job_monarch/templates/header.tpl    2008-08-06 19:21:50.000000000 +0200
+@@ -1,7 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <HTML>
+ <HEAD>
+-<TITLE>Ganglia :: {longpage_title}</TITLE>
++<TITLE>Ganglia Batch Report of {longpage_title}</TITLE>
+ <META http-equiv="Content-type" content="text/html; charset=utf-8">
+ <META http-equiv="refresh" content="{refresh}{redirect}" >
+ <LINK rel="stylesheet" href="./styles.css" type="text/css">
+@@ -34,7 +34,7 @@
+   <TR BGCOLOR="#DDDDDD">
+      <TD BGCOLOR="#DDDDDD">
+      <FONT SIZE="+1">
+-     <B>{page_title} for {date}</B>
++     <B>{page_title} @ {date}</B>
+      </FONT>
+      </TD>
+      <TD BGCOLOR="#DDDDDD" ALIGN="RIGHT">
diff --git a/sys-cluster/ganglia_jobmonarch/files/job_monarch_link.sh b/sys-cluster/ganglia_jobmonarch/files/job_monarch_link.sh
new file mode 100644
index 000000000..dfcbfea4f
--- /dev/null
+++ b/sys-cluster/ganglia_jobmonarch/files/job_monarch_link.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+install() {
+	cd /var/www/localhost/htdocs/$1
+	mkdir addons; mkdir addons/job_monarch; cd addons/job_monarch
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/cal.gif
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/conf.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/document_archive.jpg
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/footer.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/graph.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/header.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/host_view.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/image.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/index.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/jobmonarch.gif
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/libtoga.js
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/libtoga.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/logo_ned.gif
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/next.gif
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/overview.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/prev.gif
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/redcross.jpg
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/search.php
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/styles.css
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/ts_picker.js
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/ts_validatetime.js
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/version.php
+
+	mkdir clusterconf; cd clusterconf
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/clusterconf/example.php
+	cd ..
+
+	mkdir templates; cd templates
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/templates/footer.tpl
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/templates/header.tpl
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/templates/host_view.tpl
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/templates/index.tpl
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/templates/overview.tpl
+	ln /var/www/localhost/htdocs/$2/addons/job_monarch/templates/search.tpl
+	ln -s ../../../templates/default/images
+
+	cd /var/www/localhost/htdocs/$1
+	mkdir templates/job_monarch; cd templates/job_monarch
+	ln /var/www/localhost/htdocs/$2/templates/job_monarch/cluster_extra.tpl
+	ln /var/www/localhost/htdocs/$2/templates/job_monarch/host_extra.tpl
+	ln -s ../default/images
+}
+
+uninstall() {
+	rm -Rf /var/www/localhost/htdocs/$1/addons/job_monarch/* && rmdir /var/www/localhost/htdocs/$1/addons/job_monarch && rmdir /var/www/localhost/htdocs/$1/addons
+	rm -Rf /var/www/localhost/htdocs/$1/templates/job_monarch/* && rmdir /var/www/localhost/htdocs/$1/templates/job_monarch
+}
+
+case "$1" in
+	install)
+		install $2 $3
+	;;
+	uninstall)
+		uninstall $2
+	;;
+	*)
+		echo -e "\033[34;1mUsage: job_monarch_link.sh [ install <ganglia_dir> <jobmonarch_dir> | uninstall <ganglia_dir> ]\033[0m"
+	;;
+esac
diff --git a/sys-cluster/ganglia_jobmonarch/files/jobarchived.initd b/sys-cluster/ganglia_jobmonarch/files/jobarchived.initd
new file mode 100644
index 000000000..e1de75d0b
--- /dev/null
+++ b/sys-cluster/ganglia_jobmonarch/files/jobarchived.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/jobarchived.pid
+
+depend() {
+    need gmond
+}
+
+start() {
+    ebegin "Starting Jobarchived"
+    start-stop-daemon --start --exec /sbin/jobarchived.py -- -p ${PIDFILE} -c /etc/jobarchived.conf
+    eend 0
+}
+
+stop() {
+    ebegin "Stopping Jobarchived"
+    start-stop-daemon --stop --quiet --signal TERM -p ${PIDFILE}
+    eend $?
+}
+
+restart() {
+    svc_stop
+    sleep 3
+    svc_start
+}
+# vim:ts=4
diff --git a/sys-cluster/ganglia_jobmonarch/files/jobmond.initd b/sys-cluster/ganglia_jobmonarch/files/jobmond.initd
new file mode 100644
index 000000000..619495c8b
--- /dev/null
+++ b/sys-cluster/ganglia_jobmonarch/files/jobmond.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/jobmond.pid
+
+depend() {
+    need gmond
+}
+
+start() {
+    ebegin "Starting Jobmond"
+    start-stop-daemon --start --exec /sbin/jobmond.py -- -p ${PIDFILE} -c /etc/jobmond.conf
+    eend 0
+}
+
+stop() {
+    ebegin "Stopping Jobmond"
+    start-stop-daemon --stop --quiet --signal TERM -p ${PIDFILE}
+    eend $?
+}
+
+restart() {
+    svc_stop
+    sleep 3
+    svc_start
+}
+# vim:ts=4
diff --git a/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
new file mode 100644
index 000000000..dc1b01006
--- /dev/null
+++ b/sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+WEBAPP_OPTIONAL="yes"
+inherit eutils webapp depend.php
+
+DESCRIPTION="Ganglia addons for Torque"
+HOMEPAGE="https://subtrac.sara.nl/oss/jobmonarch/"
+SRC_URI="ftp://ftp.sara.nl/pub/outgoing/jobmonarch/latest/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="vhosts"
+WEBAPP_MANUAL_SLOT="yes"
+
+GANGLIA="ganglia"
+JOBMONARCH="ganglia_jobmonarch"
+
+DEPEND="
+	sys-cluster/ganglia
+	dev-lang/php[gd,xml,ctype]
+	media-libs/gd
+	sys-cluster/pbs-python
+	dev-python/pypgsql
+	${WEBAPP_DEPEND}"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix.patch
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}/jobmond/jobmond.conf"
+	doins "${S}/jobarchived/jobarchived.conf"
+
+	insinto /usr/share/jobmonarch/
+	doins "${S}/jobarchived/job_dbase.sql"
+
+	dodir /var/lib/jobarchive
+
+	insopts -m0755
+	insinto /sbin
+	doins "${S}/jobmond/jobmond.py"
+	doins "${S}/jobarchived/jobarchived.py"
+	doins "${S}/jobarchived/pipe_jobarchived.py"
+	doins "${FILESDIR}/job_monarch_link.sh"
+
+	newinitd "${FILESDIR}/jobmond.initd" jobmond
+	newinitd "${FILESDIR}/jobarchived.initd" jobarchived
+
+	cd "${S}/web/templates/job_monarch/"
+	rm images/*
+	rmdir images
+
+	cd "${S}"
+	webapp_src_preinst
+	insinto "${MY_HTDOCSDIR}"
+	doins -r web/*
+
+	webapp_configfile "${MY_HTDOCSDIR}"/addons/job_monarch/conf.php
+	webapp_src_install
+
+	ewarn
+	ewarn "You must Execute: job_monarch_link.sh install ${GANGLIA} ${JOBMONARCH} to have the JobMonArch installed under ganglia"
+	ewarn
+	ewarn "You must Execute: job_monarch_link.sh uninstall ${GANGLIA} to remove link from ganglia directories"
+	ewarn
+}
diff --git a/sys-cluster/ganglia_jobmonarch/metadata.xml b/sys-cluster/ganglia_jobmonarch/metadata.xml
new file mode 100644
index 000000000..081af556e
--- /dev/null
+++ b/sys-cluster/ganglia_jobmonarch/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>cluster</herd>
+</pkgmetadata>