add d.o-nagios.d.o

diff --git a/debian/changelog b/debian/changelog
index 0dbedaf1e91184f463b9c666bd4e8a2aac83cf08..c744dc3232678397276dfca23a01ca51e5835e1f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian.org (54) UNRELEASED; urgency=medium
+debian.org (54~20140215) UNRELEASED; urgency=medium
 
   [ Hector Oron ]
   * packages-master.d.o:
@@ -16,6 +16,11 @@ debian.org (54) UNRELEASED; urgency=medium
     + python-django versioned to backports version
     + python-debiancontributors
 
+  [ Martin Zobel-Helas ]
+  * nagios.debian.org:
+    + add remoteuser-hack
+    + divert some nagios CGIs to get them called by remoteuser-hack
+
  -- Hector Oron <zumbi@debian.org>  Thu, 06 Feb 2014 17:01:23 +0100
 
 debian.org (53) unstable; urgency=low

diff --git a/debian/control b/debian/control
index 7d2782fbe7a86356a2d86d8d5797bf000da6ae11..c20b611c6a769c41bae599a462ac93ca946df50a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1014,3 +1014,9 @@ Depends: perl-doc,
 Description: metapackages for dns.debian.org master dependencies
  This package depends on everything that is needed for the service
 
+Package: debian.org-nagios.debian.org
+Architecture: all
+Depends: icinga
+Description: metapackages for nagios.debian.org master dependencies
+ This package depends on everything that is needed for the service and
+ also provides the dpkg-diverts for the REMOTE_USER hack

diff --git a/debian/debian.org-nagios.debian.org.install b/debian/debian.org-nagios.debian.org.install
new file mode 100644 (file)
index 0000000..a5f82b4
--- /dev/null
+++ b/debian/debian.org-nagios.debian.org.install
@@ -0,0 +1 @@
+remoteuser-hack /usr/bin

diff --git a/debian/debian.org-nagios.debian.org.links b/debian/debian.org-nagios.debian.org.links
new file mode 100644 (file)
index 0000000..2bc3685
--- /dev/null
+++ b/debian/debian.org-nagios.debian.org.links
@@ -0,0 +1,16 @@
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/showlog.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/trends.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/avail.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/notifications.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/statuswml.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/history.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/cmd.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/histogram.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/tac.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/outages.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/extinfo.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/config.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/summary.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/status.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/statusmap.cgi
+/usr/bin/remoteuser-hack /usr/lib/cgi-bin/icinga/statuswrl.cgi

diff --git a/debian/debian.org-nagios.debian.org.postrm b/debian/debian.org-nagios.debian.org.postrm
new file mode 100644 (file)
index 0000000..c99ae9c
--- /dev/null
+++ b/debian/debian.org-nagios.debian.org.postrm
@@ -0,0 +1,50 @@
+#!/bin/sh
+# postrm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+TAKEOVER="
+/usr/lib/cgi-bin/icinga/showlog.cgi
+/usr/lib/cgi-bin/icinga/trends.cgi
+/usr/lib/cgi-bin/icinga/avail.cgi
+/usr/lib/cgi-bin/icinga/notifications.cgi
+/usr/lib/cgi-bin/icinga/statuswml.cgi
+/usr/lib/cgi-bin/icinga/history.cgi
+/usr/lib/cgi-bin/icinga/cmd.cgi
+/usr/lib/cgi-bin/icinga/histogram.cgi
+/usr/lib/cgi-bin/icinga/tac.cgi
+/usr/lib/cgi-bin/icinga/outages.cgi
+/usr/lib/cgi-bin/icinga/extinfo.cgi
+/usr/lib/cgi-bin/icinga/config.cgi
+/usr/lib/cgi-bin/icinga/summary.cgi
+/usr/lib/cgi-bin/icinga/status.cgi
+/usr/lib/cgi-bin/icinga/statusmap.cgi
+/usr/lib/cgi-bin/icinga/statuswrl.cgi
+"
+
+case "$1" in
+    purge|upgrade|failed-upgrade|abort-upgrade)
+    ;;
+
+    remove|abort-install|disappear)
+       for f in $TAKEOVER
+       do
+               dpkg-divert --package debian.org-nagios.debian.org --remove --rename \
+                           --divert $f.real $f
+       done
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/debian.org-nagios.debian.org.preinst b/debian/debian.org-nagios.debian.org.preinst
new file mode 100644 (file)
index 0000000..8d2304b
--- /dev/null
+++ b/debian/debian.org-nagios.debian.org.preinst
@@ -0,0 +1,51 @@
+#!/bin/sh
+# preinst script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+TAKEOVER="
+/usr/lib/cgi-bin/icinga/showlog.cgi
+/usr/lib/cgi-bin/icinga/trends.cgi
+/usr/lib/cgi-bin/icinga/avail.cgi
+/usr/lib/cgi-bin/icinga/notifications.cgi
+/usr/lib/cgi-bin/icinga/statuswml.cgi
+/usr/lib/cgi-bin/icinga/history.cgi
+/usr/lib/cgi-bin/icinga/cmd.cgi
+/usr/lib/cgi-bin/icinga/histogram.cgi
+/usr/lib/cgi-bin/icinga/tac.cgi
+/usr/lib/cgi-bin/icinga/outages.cgi
+/usr/lib/cgi-bin/icinga/extinfo.cgi
+/usr/lib/cgi-bin/icinga/config.cgi
+/usr/lib/cgi-bin/icinga/summary.cgi
+/usr/lib/cgi-bin/icinga/status.cgi
+/usr/lib/cgi-bin/icinga/statusmap.cgi
+/usr/lib/cgi-bin/icinga/statuswrl.cgi
+"
+
+case "$1" in
+    install|upgrade)
+       for f in $TAKEOVER
+       do
+               dpkg-divert --package libgrib-api-data-sim --add --rename \
+                           --divert $f.real $f
+       done
+
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

diff --git a/remoteuser-hack b/remoteuser-hack
new file mode 100755 (executable)
index 0000000..7103890
--- /dev/null
+++ b/remoteuser-hack
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ -e $DACS_USERNAME ]; then
+       REMOTE_USER=$DACS_USERNAME
+       export REMOTE_USER
+fi
+
+$0.real "$@"