X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fpostgresql;h=93cac8c4bd3fda251d0401459079d05b9934ad42;hb=ea599807fccfe0890f3fa0c49a085a72426111f5;hp=d1c56d4d4e05596a263521b8ad021b26026ec33f;hpb=fe81b2c91b436b1882f63023413c7f51b29538ed;p=plcapi.git

diff --git a/plc.d/postgresql b/plc.d/postgresql
index d1c56d4..93cac8c 100755
--- a/plc.d/postgresql
+++ b/plc.d/postgresql
@@ -1,6 +1,4 @@
 #!/bin/bash
-# $Id$
-# $URL$
 #
 # priority: 700
 #
@@ -81,19 +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
-	    # tweak timezone to be 'UTC'
-	    sed -i -e '/^timezone=/d' $postgresql_conf
-	    echo "timezone='UTC'" >> $postgresql_conf
-	else
-	    dialog "PostgreSQL <= 7.x - not supported"
-	    /bin/false
-	    check
-	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