[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-1-8-gd0b47cf

[Markus Frosch]

The following commit has been merged in the master branch:
commit e97300a21f4858da2d01d495f9f1f597767cdc9f
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Jun 27 19:38:34 2012 +0200

    Revert "added template to warn user that the root password for web cannot be set when db config is missing"
    
    This reverts commit 2e51e4f0dc3ee40b938c8dd1b3273be996b7af1d.

diff --git a/debian/icinga-web.postinst b/debian/icinga-web.postinst
index 2dff7af..7ea6410 100644
--- a/debian/icinga-web.postinst
+++ b/debian/icinga-web.postinst
@@ -112,8 +112,6 @@ setpassword() {
     
     # load database connection info
     if [ ! -f /etc/dbconfig-common/icinga-web.conf ]; then
-        db_fset icinga-web/rootpassword-dbconfig-missing seen false || true
-        db_input high icinga-web/rootpassword-dbconfig-missing || true
         return
     fi
     source /etc/dbconfig-common/icinga-web.conf
diff --git a/debian/icinga-web.templates b/debian/icinga-web.templates
index f4caf7f..27ef931 100644
--- a/debian/icinga-web.templates
+++ b/debian/icinga-web.templates
@@ -31,12 +31,3 @@ Type: error
 _Description: Password input error
  The two passwords you entered were not the same. Please try again.
 
-Template: icinga-web/rootpassword-dbconfig-missing
-Type: error
-_Description: Database configuration missing
- The database configuration for Icinga Web is missing.
- .
- Your root password for the web interface can not be configured automatically.
- .
- The default password, which is included in the database schema is "password".
-
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 102b7e8..13d5894 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: icinga-web\n"
 "Report-Msgid-Bugs-To: icinga-web at packages.debian.org\n"
-"POT-Creation-Date: 2012-06-26 08:47+0200\n"
+"POT-Creation-Date: 2012-06-19 08:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -98,30 +98,3 @@ msgstr ""
 #: ../icinga-web.templates:4001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
-
-#. Type: error
-#. Description
-#: ../icinga-web.templates:5001
-msgid "Database configuration missing"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../icinga-web.templates:5001
-msgid "The database configuration for Icinga Web is missing."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../icinga-web.templates:5001
-msgid ""
-"Your root password for the web interface can not be configured automatically."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../icinga-web.templates:5001
-msgid ""
-"The default password, which is included in the database schema is \"password"
-"\"."
-msgstr ""

-- 
Debian packaging of icinga-web