[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 0600496bd3046be22da1ce505ca3878cf730dee9
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Jun 27 20:16:49 2012 +0200

    added kind of support for PostgreSQL socket connections with ident. (Closes: #678221)
    
    The user still has manual work to use it. Database connections are configured correctly now.

diff --git a/debian/README.Debian b/debian/README.Debian
index 9e81611..bcefb32 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,6 +5,18 @@ Notes:
 
   * Supported databases are: MySQL and PostgreSQL (by auto configuration)
 
+  * PostgreSQL with ident authentication:
+    
+     This is not really supported, just because icinga-web runs as www-data
+     per default. You will have to do some configuration stuff to run
+     icinga-web with ident. But you'll have to do this on your own.
+    
+     Though the maintainer scripts will create you a config for the
+     socket connection.
+    
+     Every access rights the maintainer script changes is checked
+     against dpkg-statoverride - so make sure to use it.
+     
   * Icinga Web uses two database connections
 
     1) IDO database, which is configured with by a dependency
diff --git a/debian/icinga-web.postinst b/debian/icinga-web.postinst
index 7ea6410..36d9e67 100644
--- a/debian/icinga-web.postinst
+++ b/debian/icinga-web.postinst
@@ -43,6 +43,9 @@ generate_dbxml() {
     dbc_edbuser=$(uriescape $dbc_dbuser)
     dbc_edbpass=$(uriescape $dbc_dbpass)
     dbc_edbname=$(uriescape $dbc_dbname)
+    
+    # allow pgsql socket
+    [ "$dbc_server" = "" ] && [ "$dbc_authmethod_user" = "ident" ] && dbc_server="%2Fvar%2Frun%2Fpostgresql"
 
     # uri escape the vars
     # build the dsn

-- 
Debian packaging of icinga-web