[Pkg-nagios-changes] [pkg-icinga-web] 03/11: Split configuration of IDO connection to separate packages

Markus Frosch (old DM Account) lazyfrosch-guest at moszumanska.debian.org
Tue Sep 9 13:02:07 UTC 2014


This is an automated email from the git hooks/post-receive script.

lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga-web.

commit 8e87a20012486037acaf01bf123cc42b6653a0ac
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Sep 9 12:31:22 2014 +0200

    Split configuration of IDO connection to separate packages
---
 debian/control                                     | 94 +++++++++++++++++++-
 debian/icinga-web-config-icinga.README.Debian      | 11 +++
 debian/icinga-web-config-icinga.postinst           | 99 ++++++++++++++++++++++
 debian/icinga-web-config-icinga.postrm             | 13 +++
 ...inga-web-config-icinga2-ido-mysql.README.Debian | 11 +++
 .../icinga-web-config-icinga2-ido-mysql.postinst   | 99 ++++++++++++++++++++++
 debian/icinga-web-config-icinga2-ido-mysql.postrm  | 13 +++
 ...inga-web-config-icinga2-ido-pgsql.README.Debian | 11 +++
 .../icinga-web-config-icinga2-ido-pgsql.postinst   | 99 ++++++++++++++++++++++
 debian/icinga-web-config-icinga2-ido-pgsql.postrm  | 13 +++
 debian/icinga-web.postinst                         | 23 ++---
 debian/icinga-web.postrm                           |  2 -
 12 files changed, 467 insertions(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index 756bf02..a8df789 100644
--- a/debian/control
+++ b/debian/control
@@ -23,10 +23,13 @@ Depends: dbconfig-common,
 # Notice: this will prevent users from using icinga-web 1.11 with a
 # Icinga IDO lower than 1.11 - also see the appropriate NEWS entry
 Breaks: icinga-idoutils (<< 1.11)
-Recommends: icinga-idoutils,
-            apache2 | httpd,
-            mysql-client | postgresql-client
-Suggests: icinga-doc, nagios-images
+Recommends:
+    apache2 | httpd,
+    mysql-client | postgresql-client
+Suggests:
+    icinga-web-config-icinga2-ido-mysql | icinga-web-config-icinga2-ido-pgsql | icinga-web-config-icinga,
+    icinga-doc,
+    nagios-images
 Description: host and network monitoring system - modern web interface
  Icinga is a modular monitoring framework for hosts, services, and
  networks, based on the Nagios project. It is designed to be easy to
@@ -48,6 +51,89 @@ Description: host and network monitoring system - modern web interface
  history, notifications and status maps are available to keep a check on
  the health of your network in real time.
 
+Package: icinga-web-config-icinga
+Architecture: all
+Depends:
+    icinga-web (= ${source:Version}),
+    icinga-idoutils,
+    ucf,
+    ${misc:Depends}
+Conflicts: icinga-web-config-icinga2
+Description: host and network monitoring system - database config for Icinga 1.x
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+  * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+    TCP port;
+  * plugin interface to allow for user-developed service checks;
+  * contact notifications when problems occur and get resolved (via
+    email, pager, or user-defined method)
+  * support for proactive problem resolution (handlers can be defined to
+    be run during service or host events);
+  * web output: current status, notifications, problem history, log
+    file, etc.
+ .
+ This package provides database auto configuration of the Icinga 1.x IDO for
+ the web interface.
+
+Package: icinga-web-config-icinga2-ido-mysql
+Architecture: all
+Depends:
+    icinga-web (= ${source:Version}),
+    icinga2-ido-mysql,
+    php5-mysql | php5-mysqlnd,
+    ucf,
+    ${misc:Depends}
+Conflicts: icinga-web-config-icinga, icinga-web-config-icinga2-ido-pgsql
+Description: host and network monitoring system - config for Icinga 2 MySQL IDO
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+  * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+    TCP port;
+  * plugin interface to allow for user-developed service checks;
+  * contact notifications when problems occur and get resolved (via
+    email, pager, or user-defined method)
+  * support for proactive problem resolution (handlers can be defined to
+    be run during service or host events);
+  * web output: current status, notifications, problem history, log
+    file, etc.
+ .
+ This package provides database auto configuration of the Icinga 2 MySQL IDO
+ for the web interface.
+
+Package: icinga-web-config-icinga2-ido-pgsql
+Architecture: all
+Depends:
+    icinga-web (= ${source:Version}),
+    icinga2-ido-pgsql,
+    php5-pgsql,
+    ucf,
+    ${misc:Depends}
+Conflicts: icinga-web-config-icinga, icinga-web-config-icinga2-ido-mysql
+Description: host and network monitoring system - config for Icinga 2 PgSQL IDO
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+  * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+    TCP port;
+  * plugin interface to allow for user-developed service checks;
+  * contact notifications when problems occur and get resolved (via
+    email, pager, or user-defined method)
+  * support for proactive problem resolution (handlers can be defined to
+    be run during service or host events);
+  * web output: current status, notifications, problem history, log
+    file, etc.
+ .
+ This package provides database auto configuration of the Icinga 2 PgSQL IDO
+ for the web interface.
+
 Package: icinga-web-pnp
 Architecture: all
 Depends: icinga-web (= ${source:Version}), ${misc:Depends}
diff --git a/debian/icinga-web-config-icinga.README.Debian b/debian/icinga-web-config-icinga.README.Debian
new file mode 100644
index 0000000..b0419d4
--- /dev/null
+++ b/debian/icinga-web-config-icinga.README.Debian
@@ -0,0 +1,11 @@
+icinga-web-config-icinga for Debian
+=========================
+
+This package configures the IDO database connection for Icinga Web based on
+the dbconfig-common settings for icinga-idoutils.
+
+You can do this manually - without this package - by updating:
+ /etc/icinga-web/conf.d/databases.xml
+
+ -- Markus Frosch <lazyfrosch at debian.org>  Tue, 09 Sep 2014 11:40:44 +0200
+
diff --git a/debian/icinga-web-config-icinga.postinst b/debian/icinga-web-config-icinga.postinst
new file mode 100644
index 0000000..75bf071
--- /dev/null
+++ b/debian/icinga-web-config-icinga.postinst
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+set -e
+
+uriescape() {
+    echo "$(perl -MCGI::Util -e 'print CGI::Util::escape($ARGV[0]);' "$1")"
+}
+
+setperm() {
+    local user="$1"
+    local group="$2"
+    local mode="$3"
+    local file="$4"
+    shift 4
+    # only do something when no setting exists
+    if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+      chown "$user":"$group" "$file"
+      chmod "$mode" "$file"
+    fi
+}
+
+generate_dbxml() {
+    local file="$1"
+    local template="$2"
+    local dbconfig="$3"
+
+    source $dbconfig
+
+    # leave when dbconfig not enabled
+    if [ "$dbc_install" != "true" ]; then
+        echo "database config failed: dbconfig-common for \"$(basename $dbconfig .conf)\" not enabled!" 
+        exit 1
+    fi
+
+    # create tempfile
+    local tempfile=$(tempfile -m 600 -p "$(basename $file)")
+
+    # add a colon to port
+    [ "$dbc_dbport" != "" ] && dbc_dbport=":$dbc_dbport"
+    dbc_edbuser=$(uriescape $dbc_dbuser)
+    dbc_edbpass=$(uriescape $dbc_dbpass)
+    dbc_edbname=$(uriescape $dbc_dbname)
+
+    # allow pgsql socket
+    [ "$dbc_dbserver" = "" ] && [ "$dbc_authmethod_user" = "ident" ] && dbc_dbserver="%2Fvar%2Frun%2Fpostgresql"
+
+    # uri escape the vars
+    # build the dsn
+    local dsn="$dbc_dbtype://$dbc_edbuser:$dbc_edbpass@${dbc_dbserver:=localhost}$dbc_dbport/$dbc_edbname"
+
+    # write xml to temp
+    cat $template | sed "s|_DBDSN_|$dsn|" > $tempfile
+
+    # replace the file with ucf
+    ucf --debconf-ok $tempfile $file
+
+    echo "database config successful: $file"
+    rm -f $tempfile
+}
+
+case "$1" in
+    configure)
+        if [ -f /etc/dbconfig-common/icinga-idoutils.conf ]; then
+            echo "Configuration IDO database for Icinga 1..."
+            generate_dbxml /etc/icinga-web/conf.d/database-ido.xml \
+                           /usr/share/icinga-web/tmpl/database-ido.xml.tmpl \
+                           /etc/dbconfig-common/icinga-idoutils.conf
+
+            setperm root www-data 0640 /etc/icinga-web/conf.d/database-ido.xml
+        else
+            (
+            echo
+            echo "[ ERROR ]"
+            echo "cannot configure IDO database connection!"
+            echo "the database might not been configured with dbconfig-common"
+            echo "or there was another problem, the config file is missing:"
+            echo " /etc/dbconfig-common/icinga-idoutils.conf"
+            echo
+            ) >&2
+            exit 1
+        fi
+
+        if [ -x /usr/lib/icinga-web/bin/clearcache.sh ]; then
+            /usr/lib/icinga-web/bin/clearcache.sh
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/icinga-web-config-icinga.postrm b/debian/icinga-web-config-icinga.postrm
new file mode 100644
index 0000000..68c2939
--- /dev/null
+++ b/debian/icinga-web-config-icinga.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+    rm -f /etc/icinga-web/conf.d/database-ido.xml
+    if which ucf >/dev/null; then
+        ucf --purge /etc/icinga-web/conf.d/database-ido.xml
+    fi
+fi
+
+#DEBHELPER#
+
diff --git a/debian/icinga-web-config-icinga2-ido-mysql.README.Debian b/debian/icinga-web-config-icinga2-ido-mysql.README.Debian
new file mode 100644
index 0000000..8032d06
--- /dev/null
+++ b/debian/icinga-web-config-icinga2-ido-mysql.README.Debian
@@ -0,0 +1,11 @@
+icinga-web-config-icinga2-ido-mysql for Debian
+==============================================
+
+This package configures the IDO database connection for Icinga Web based on
+the dbconfig-common settings for icinga2-ido-mysql.
+
+You can do this manually - without this package - by updating:
+ /etc/icinga-web/conf.d/databases.xml
+
+ -- Markus Frosch <lazyfrosch at debian.org>  Tue, 09 Sep 2014 11:40:44 +0200
+
diff --git a/debian/icinga-web-config-icinga2-ido-mysql.postinst b/debian/icinga-web-config-icinga2-ido-mysql.postinst
new file mode 100644
index 0000000..8ef14e5
--- /dev/null
+++ b/debian/icinga-web-config-icinga2-ido-mysql.postinst
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+set -e
+
+uriescape() {
+    echo "$(perl -MCGI::Util -e 'print CGI::Util::escape($ARGV[0]);' "$1")"
+}
+
+setperm() {
+    local user="$1"
+    local group="$2"
+    local mode="$3"
+    local file="$4"
+    shift 4
+    # only do something when no setting exists
+    if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+      chown "$user":"$group" "$file"
+      chmod "$mode" "$file"
+    fi
+}
+
+generate_dbxml() {
+    local file="$1"
+    local template="$2"
+    local dbconfig="$3"
+
+    source $dbconfig
+
+    # leave when dbconfig not enabled
+    if [ "$dbc_install" != "true" ]; then
+        echo "database config failed: dbconfig-common for \"$(basename $dbconfig .conf)\" not enabled!" 
+        exit 1
+    fi
+
+    # create tempfile
+    local tempfile=$(tempfile -m 600 -p "$(basename $file)")
+
+    # add a colon to port
+    [ "$dbc_dbport" != "" ] && dbc_dbport=":$dbc_dbport"
+    dbc_edbuser=$(uriescape $dbc_dbuser)
+    dbc_edbpass=$(uriescape $dbc_dbpass)
+    dbc_edbname=$(uriescape $dbc_dbname)
+
+    # allow pgsql socket
+    [ "$dbc_dbserver" = "" ] && [ "$dbc_authmethod_user" = "ident" ] && dbc_dbserver="%2Fvar%2Frun%2Fpostgresql"
+
+    # uri escape the vars
+    # build the dsn
+    local dsn="$dbc_dbtype://$dbc_edbuser:$dbc_edbpass@${dbc_dbserver:=localhost}$dbc_dbport/$dbc_edbname"
+
+    # write xml to temp
+    cat $template | sed "s|_DBDSN_|$dsn|" > $tempfile
+
+    # replace the file with ucf
+    ucf --debconf-ok $tempfile $file
+
+    echo "database config successful: $file"
+    rm -f $tempfile
+}
+
+case "$1" in
+    configure)
+        if [ -f /etc/dbconfig-common/icinga2-ido-mysql.conf ]; then
+            echo "Configuration IDO database for the MySQL IDO of Icinga 2..."
+            generate_dbxml /etc/icinga-web/conf.d/database-ido.xml \
+                           /usr/share/icinga-web/tmpl/database-ido.xml.tmpl \
+                           /etc/dbconfig-common/icinga2-ido-mysql.conf
+
+            setperm root www-data 0640 /etc/icinga-web/conf.d/database-ido.xml
+        else
+            (
+            echo
+            echo "[ ERROR ]"
+            echo "cannot configure IDO database connection!"
+            echo "the database might not been configured with dbconfig-common"
+            echo "or there was another problem, this config file is missing:"
+            echo " /etc/dbconfig-common/icinga2-ido-mysql.conf"
+            echo
+            ) >&2
+            exit 1
+        fi
+
+        if [ -x /usr/lib/icinga-web/bin/clearcache.sh ]; then
+            /usr/lib/icinga-web/bin/clearcache.sh
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/icinga-web-config-icinga2-ido-mysql.postrm b/debian/icinga-web-config-icinga2-ido-mysql.postrm
new file mode 100644
index 0000000..68c2939
--- /dev/null
+++ b/debian/icinga-web-config-icinga2-ido-mysql.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+    rm -f /etc/icinga-web/conf.d/database-ido.xml
+    if which ucf >/dev/null; then
+        ucf --purge /etc/icinga-web/conf.d/database-ido.xml
+    fi
+fi
+
+#DEBHELPER#
+
diff --git a/debian/icinga-web-config-icinga2-ido-pgsql.README.Debian b/debian/icinga-web-config-icinga2-ido-pgsql.README.Debian
new file mode 100644
index 0000000..fbc6201
--- /dev/null
+++ b/debian/icinga-web-config-icinga2-ido-pgsql.README.Debian
@@ -0,0 +1,11 @@
+icinga-web-config-icinga2-ido-pgsql for Debian
+==============================================
+
+This package configures the IDO database connection for Icinga Web based on
+the dbconfig-common settings for icinga2-ido-pgsql.
+
+You can do this manually - without this package - by updating:
+ /etc/icinga-web/conf.d/databases.xml
+
+ -- Markus Frosch <lazyfrosch at debian.org>  Tue, 09 Sep 2014 11:40:44 +0200
+
diff --git a/debian/icinga-web-config-icinga2-ido-pgsql.postinst b/debian/icinga-web-config-icinga2-ido-pgsql.postinst
new file mode 100644
index 0000000..b913c48
--- /dev/null
+++ b/debian/icinga-web-config-icinga2-ido-pgsql.postinst
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+set -e
+
+uriescape() {
+    echo "$(perl -MCGI::Util -e 'print CGI::Util::escape($ARGV[0]);' "$1")"
+}
+
+setperm() {
+    local user="$1"
+    local group="$2"
+    local mode="$3"
+    local file="$4"
+    shift 4
+    # only do something when no setting exists
+    if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+      chown "$user":"$group" "$file"
+      chmod "$mode" "$file"
+    fi
+}
+
+generate_dbxml() {
+    local file="$1"
+    local template="$2"
+    local dbconfig="$3"
+
+    source $dbconfig
+
+    # leave when dbconfig not enabled
+    if [ "$dbc_install" != "true" ]; then
+        echo "database config failed: dbconfig-common for \"$(basename $dbconfig .conf)\" not enabled!" 
+        exit 1
+    fi
+
+    # create tempfile
+    local tempfile=$(tempfile -m 600 -p "$(basename $file)")
+
+    # add a colon to port
+    [ "$dbc_dbport" != "" ] && dbc_dbport=":$dbc_dbport"
+    dbc_edbuser=$(uriescape $dbc_dbuser)
+    dbc_edbpass=$(uriescape $dbc_dbpass)
+    dbc_edbname=$(uriescape $dbc_dbname)
+
+    # allow pgsql socket
+    [ "$dbc_dbserver" = "" ] && [ "$dbc_authmethod_user" = "ident" ] && dbc_dbserver="%2Fvar%2Frun%2Fpostgresql"
+
+    # uri escape the vars
+    # build the dsn
+    local dsn="$dbc_dbtype://$dbc_edbuser:$dbc_edbpass@${dbc_dbserver:=localhost}$dbc_dbport/$dbc_edbname"
+
+    # write xml to temp
+    cat $template | sed "s|_DBDSN_|$dsn|" > $tempfile
+
+    # replace the file with ucf
+    ucf --debconf-ok $tempfile $file
+
+    echo "database config successful: $file"
+    rm -f $tempfile
+}
+
+case "$1" in
+    configure)
+        if [ -f /etc/dbconfig-common/icinga2-ido-pgsql.conf ]; then
+            echo "Configuration IDO database for the PostgreSQL IDO of Icinga 2..."
+            generate_dbxml /etc/icinga-web/conf.d/database-ido.xml \
+                           /usr/share/icinga-web/tmpl/database-ido.xml.tmpl \
+                           /etc/dbconfig-common/icinga2-ido-pgsql.conf
+
+            setperm root www-data 0640 /etc/icinga-web/conf.d/database-ido.xml
+        else
+            (
+            echo
+            echo "[ ERROR ]"
+            echo "cannot configure IDO database connection!"
+            echo "the database might not been configured with dbconfig-common"
+            echo "or there was another problem, this config file is missing:"
+            echo " /etc/dbconfig-common/icinga2-ido-pgsql.conf"
+            echo
+            ) >&2
+            exit 1
+        fi
+
+        if [ -x /usr/lib/icinga-web/bin/clearcache.sh ]; then
+            /usr/lib/icinga-web/bin/clearcache.sh
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/icinga-web-config-icinga2-ido-pgsql.postrm b/debian/icinga-web-config-icinga2-ido-pgsql.postrm
new file mode 100644
index 0000000..68c2939
--- /dev/null
+++ b/debian/icinga-web-config-icinga2-ido-pgsql.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+    rm -f /etc/icinga-web/conf.d/database-ido.xml
+    if which ucf >/dev/null; then
+        ucf --purge /etc/icinga-web/conf.d/database-ido.xml
+    fi
+fi
+
+#DEBHELPER#
+
diff --git a/debian/icinga-web.postinst b/debian/icinga-web.postinst
index ff03522..64d3641 100644
--- a/debian/icinga-web.postinst
+++ b/debian/icinga-web.postinst
@@ -39,7 +39,7 @@ generate_dbxml() {
 
     # leave when dbconfig not enabled
     if [ "$dbc_install" != "true" ]; then
-        echo "database config failed: dbconfig-common for \"$(basename $dbconfig .conf)\" not enabled!" 
+        echo "database config failed: dbconfig-common for \"$(basename $dbconfig .conf)\" not enabled!"
         return
     fi
 
@@ -73,10 +73,6 @@ generate_dbxml /etc/icinga-web/conf.d/database-web.xml \
                /usr/share/icinga-web/tmpl/database-web.xml.tmpl \
                /etc/dbconfig-common/icinga-web.conf
 
-generate_dbxml /etc/icinga-web/conf.d/database-ido.xml \
-               /usr/share/icinga-web/tmpl/database-ido.xml.tmpl \
-               /etc/dbconfig-common/icinga-idoutils.conf
-
 ###
 # Apache2
 ###
@@ -115,7 +111,7 @@ fi
 ###
 setpassword() {
     password="$1"
-    
+
     # load database connection info
     if [ ! -f /etc/dbconfig-common/icinga-web.conf ]; then
         return
@@ -124,7 +120,7 @@ setpassword() {
 
     # gen new salt
     salt=$(php5 -r 'echo hash("sha256", uniqid("root_", mt_rand()));')
-    
+
     # gen new pw hash
     export SALT="$salt"
     export PW="$password"
@@ -132,15 +128,15 @@ setpassword() {
 
     salt_e=${salt/\'/\\\'}
     pwhash_e=${pwhash/\'/\\\'}
-    
+
     if [ "$dbc_dbtype" = "mysql" ]; then
         # query the database to update
         query="UPDATE nsm_user SET user_password='""$pwhash_e""', user_salt = '""$salt_e""', user_modified = NOW() WHERE user_name = 'root';"
-        
+
         # use app user and password for the command
         dbc_dbadmin="$dbc_dbuser"
         dbc_dbadmpass="$dbc_dbpass"
-        
+
         if dbc_mysql_exec_command "$query"; then
             echo "root password updates successfully!"
             db_fset icinga-web/rootpassword changed false || true
@@ -151,10 +147,10 @@ setpassword() {
     elif [ "$dbc_dbtype" = "pgsql" ]; then
         # query the database to update
         query="UPDATE nsm_user SET user_password='""$pwhash_e""', user_salt = '""$salt_e""', user_modified = NOW() WHERE user_name = 'root';"
-        
+
         # use the app user
         _dbc_asuser=1
-        
+
         if _dbc_pgsql_exec_command "$query"; then
             echo "root password updates successfully!"
             db_fset icinga-web/rootpassword changed false || true
@@ -216,9 +212,6 @@ setperm root www-data 0640 /etc/icinga-web/conf.d/databases.xml
 if [ -f /etc/icinga-web/conf.d/database-web.xml ]; then
     setperm root www-data 0640 /etc/icinga-web/conf.d/database-web.xml
 fi
-if [ -f /etc/icinga-web/conf.d/database-ido.xml ]; then
-    setperm root www-data 0640 /etc/icinga-web/conf.d/database-ido.xml
-fi
 setperm root www-data 0640 /etc/icinga-web/conf.d/module_reporting.xml
 
 setperm www-data adm 0770 /var/log/icinga-web
diff --git a/debian/icinga-web.postrm b/debian/icinga-web.postrm
index f99bfb8..bd5926a 100644
--- a/debian/icinga-web.postrm
+++ b/debian/icinga-web.postrm
@@ -36,10 +36,8 @@ fi
 ###
 if [ "$1" = "purge" ]; then
     rm -f /etc/icinga-web/conf.d/database-web.xml
-    rm -f /etc/icinga-web/conf.d/database-ido.xml
     if which ucf >/dev/null; then
         ucf --purge /etc/icinga-web/conf.d/database-web.xml
-        ucf --purge /etc/icinga-web/conf.d/database-ido.xml
     fi
 	rm -rf /var/cache/icinga-web
 	rm -rf /var/log/icinga-web

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga-web.git



More information about the Pkg-nagios-changes mailing list