[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Arthur Gautier]

The following commit has been merged in the debian/master branch:
commit f9e460cd41aefe6a7c28a7b28ef38b3c4b373862
Author: Arthur Gautier <aga at zenexity.com>
Date:   Mon Feb 6 20:25:16 2012 +0100

    No webui initscript

diff --git a/debian/rules b/debian/rules
index 1140518..02cdd62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,8 +66,7 @@ binary:
 	  debian/tmp/etc/init.d/shinken-poller \
 	  debian/tmp/etc/init.d/shinken-receiver \
 	  debian/tmp/etc/init.d/shinken-reactionner \
-	  debian/tmp/etc/init.d/shinken-scheduler \
-	  debian/tmp/etc/init.d/shinken-webui
+	  debian/tmp/etc/init.d/shinken-scheduler
 	
 	# Fix init.d-script-does-not-implement-required-option
 	sed -i -r 's/^(.*)\|restart\|(.*)\)([:blank:]*)/\1|restart|force-reload|\2)\3/' \
@@ -79,8 +78,7 @@ binary:
 	     debian/tmp/etc/init.d/shinken-poller \
 	     debian/tmp/etc/init.d/shinken-receiver \
 	     debian/tmp/etc/init.d/shinken-reactionner \
-	     debian/tmp/etc/init.d/shinken-scheduler \
-	     debian/tmp/etc/init.d/shinken-webui
+	     debian/tmp/etc/init.d/shinken-scheduler
 	
 	# Split in subpackages
 	dh_install
diff --git a/debian/shinken-webui.postinst b/debian/shinken-webui.postinst
index 0f8af6f..0ae3415 100644
--- a/debian/shinken-webui.postinst
+++ b/debian/shinken-webui.postinst
@@ -23,9 +23,6 @@ case "$1" in
       "s;^([[:blank:]]+auth_secret[[:blank:]]+)CHANGEME;\1$(openssl rand -hex 32) # Generated by debian install;" \
       $CONFIG_FILE_SPECIFIC
 
-    ## Ensure shinken starts automatically
-    update-rc.d shinken-webui defaults >/dev/null
-
     ## Help message
     echo "By default webui comes without any passwords configured, please"
     echo "add a password line to a contact object"
diff --git a/debian/shinken-webui.postrm b/debian/shinken-webui.postrm
deleted file mode 100644
index b0afea3..0000000
--- a/debian/shinken-webui.postrm
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh
-
-# Abort if any command returns an error value
-set -e
-
-# This script is called twice during the removal of the package; once
-# after the removal of the package's files from the system, and as
-# the final step in the removal of this package, after the package's
-# conffiles have been removed.
-
-case "$1" in
-  remove)
-    ;;
-  purge)
-    # This package has previously been removed and is now having
-    # its configuration purged from the system.
-    :
-
-    ## No need init.d autostart anymore
-    update-rc.d shinken-webui remove >/dev/null
-
-    ;;
-  disappear)
-    if test "$2" != overwriter; then
-      echo "$0: undocumented call to \`postrm $*'" 1>&2
-      exit 0
-    fi
-    # This package has been completely overwritten by package $3
-    # (version $4).  All our files are already gone from the system.
-    # This is a special case: neither "prerm remove" nor "postrm remove"
-    # have been called, because dpkg didn't know that this package would
-    # disappear until this stage.
-    :
-
-    ;;
-  upgrade)
-    # About to upgrade FROM THIS VERSION to version $2 of this package.
-    # "prerm upgrade" has been called for this version, and "preinst
-    # upgrade" has been called for the new version.  Last chance to
-    # clean up.
-    :
-
-    ;;
-  failed-upgrade)
-    # About to upgrade from version $2 of this package TO THIS VERSION.
-    # "prerm upgrade" has been called for the old version, and "preinst
-    # upgrade" has been called for this version.  This is only used if
-    # the previous version's "postrm upgrade" couldn't handle it and
-    # returned non-zero. (Fix old postrm bugs here.)
-    :
-
-    ;;
-  abort-install)
-    # Back out of an attempt to install this package.  Undo the effects of
-    # "preinst install...".  There are two sub-cases.
-    :
-
-    if test "${2+set}" = set; then
-      # When the install was attempted, version $2's configuration
-      # files were still on the system.  Undo the effects of "preinst
-      # install $2".
-      :
-
-    else
-      # We were being installed from scratch.  Undo the effects of
-      # "preinst install".
-      :
-
-    fi ;;
-  abort-upgrade)
-    # Back out of an attempt to upgrade this package from version $2
-    # TO THIS VERSION.  Undo the effects of "preinst upgrade $2".
-    :
-
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-#DEBHELPER#
-
-exit 0

-- 
UNNAMED PROJECT