Merge branch 'master' of ssh://git.onelab.eu/git/plcapi

[plcapi.git] / plc.d / postgresql

diff --git a/plc.d/postgresql b/plc.d/postgresql
index defab86..93cac8c 100755 (executable)
--- a/plc.d/postgresql
+++ b/plc.d/postgresql
@@ -1,6 +1,4 @@
 #!/bin/bash
-# $Id$
-# $URL$
 #
 # priority: 700
 #
@@ -81,15 +79,14 @@ case "$1" in
            check
        fi
 
-       # Enable DB server. PostgreSQL >=8.0 defines listen_addresses,
-       # PostgreSQL 7.x uses tcpip_socket.
-       if grep -q listen_addresses $postgresql_conf ; then
-           sed -i -e '/^listen_addresses/d' $postgresql_conf
-           echo "listen_addresses = '*'" >>$postgresql_conf
-       elif grep -q tcpip_socket $postgresql_conf ; then
-           sed -i -e '/^tcpip_socket/d' $postgresql_conf
-           echo "tcpip_socket = true" >>$postgresql_conf
-       fi
+       # Enable DB server. drop Postgresql<=7.x
+       # PostgreSQL >=8.0 defines listen_addresses
+       # listen on a specific IP + localhost, more robust when run within a vserver
+       sed -i -e '/^listen_addresses/d' $postgresql_conf
+       echo "listen_addresses = '${PLC_DB_HOST},localhost'" >> $postgresql_conf
+       # tweak timezone to be 'UTC'
+       sed -i -e '/^timezone=/d' $postgresql_conf
+       echo "timezone='UTC'" >> $postgresql_conf
 
        # Disable access to all DBs from all hosts
        sed -i -e '/^\(host\|local\)/d' $pghba_conf