[omd-commits] OMD Git: omd: thruk: fix pnp ssi files

git version control git at mathias-kettner.de
Thu Mar 19 15:57:06 CET 2015


Module:   omd
Branch:   master
Commit:   56e9b998f84b9ab17991278ef4f155e62994ed98
URL:      http://omdistro.org/projects/omd/repository/revisions/56e9b998f84b9ab17991278ef4f155e62994ed98

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Mar 19 15:57:01 2015 +0100
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Mar 19 15:57:01 2015 +0100

thruk: fix pnp ssi files

and always use the ones from the source package

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 Changelog                                            |    1 +
 packages/thruk/Makefile                              |    3 +++
 packages/thruk/skel/etc/thruk/ssi/extinfo-header.ssi |    6 ------
 packages/thruk/skel/etc/thruk/ssi/status-header.ssi  |    6 ------
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Changelog b/Changelog
index 9b2f5fd..e2cc1c7 100644
--- a/Changelog
+++ b/Changelog
@@ -52,6 +52,7 @@ This file documents the revision history for the Open Monitoring Distribution
             version, not caring about the minor versions anymore
           - Mod-Gearman: Update 1.5.2
           - Thruk: Update to 1.86-4
+            - fix pnp ssi files
           - PNP4Nagios: Update to 0.6.25
           - Updated Monitoring-Plugins to 2.1.1
           - Icinga: Update to 1.12.0
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index 35fabf3..e91ff16 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -60,6 +60,9 @@ skel:
 	find $(SKEL) -name \*.orig -exec rm {} \;
 	mkdir -p $(SKEL)/etc/thruk/bp/
 	cp $(DIR)/examples/bp_functions.pm $(SKEL)/etc/thruk/bp/
+	cp $(DIR)/ssi/status-header.ssi-pnp $(SKEL)/etc/thruk/ssi/status-header.ssi-pnp
+	cp $(DIR)/ssi/status-header.ssi-pnp $(SKEL)/etc/thruk/ssi/extinfo-header.ssi
+	cp $(DIR)/ssi/extinfo-header.ssi-tickets $(SKEL)/etc/thruk/ssi/extinfo-header.ssi-example
 
 clean:
 	rm -rf $(DIR)
diff --git a/packages/thruk/skel/etc/thruk/ssi/extinfo-header.ssi b/packages/thruk/skel/etc/thruk/ssi/extinfo-header.ssi
deleted file mode 100644
index d5e6b57..0000000
--- a/packages/thruk/skel/etc/thruk/ssi/extinfo-header.ssi
+++ /dev/null
@@ -1,6 +0,0 @@
-<script src="/###SITE###/pnp4nagios/media/js/jquery.cluetip.js" type="text/javascript"></script>
-<script type="text/javascript">
-jQuery(document).ready(function() {
-  jQuery('a.tips').cluetip({ajaxCache: false, dropShadow: false, showTitle: false });
-});
-</script>
diff --git a/packages/thruk/skel/etc/thruk/ssi/status-header.ssi b/packages/thruk/skel/etc/thruk/ssi/status-header.ssi
deleted file mode 100644
index d5e6b57..0000000
--- a/packages/thruk/skel/etc/thruk/ssi/status-header.ssi
+++ /dev/null
@@ -1,6 +0,0 @@
-<script src="/###SITE###/pnp4nagios/media/js/jquery.cluetip.js" type="text/javascript"></script>
-<script type="text/javascript">
-jQuery(document).ready(function() {
-  jQuery('a.tips').cluetip({ajaxCache: false, dropShadow: false, showTitle: false });
-});
-</script>



More information about the omd-commits mailing list