Added PGPORT var for pg_autovacuum: bug #53443, thanks to Paul Komarek

(Portage version: 2.1.2_rc1-r5)

5 files changed, 18 insertions, 5 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index ae84a6561246..de1752222749 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.299 2006/11/11 12:15:02 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.300 2006/11/11 13:39:14 dev-zero Exp $
+
+  11 Nov 2006; Tiziano Müller <dev-zero@gentoo.org>
+  files/pg_autovacuum.conf-7.4, files/pg_autovacuum.init-7.4,
+  files/pg_autovacuum.conf-8.0, files/pg_autovacuum.init-8.0:
+  Added PGPORT var for pg_autovacuum: bug #53443, thanks to Paul Komarek
 
   11 Nov 2006; Tiziano Müller <dev-zero@gentoo.org>
   files/postgresql.conf-7.4, files/postgresql.init-7.4:
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4
index 45d436d9cfcf..7a745c9c4a47 100644
--- a/dev-db/postgresql/files/pg_autovacuum.conf-7.4
+++ b/dev-db/postgresql/files/pg_autovacuum.conf-7.4
@@ -4,6 +4,10 @@ PG_AUTOVACUUM_LOG="/var/lib/postgresql/data/pg_autovacuum.log"
 # PostgreSQL user
 PGUSER="postgres"
 
+# If you changed the default database port, you have to set
+# PGPORT to the new port number, otherwise pg_autovacuum won't work.
+#PGPORT=5432
+
 # See the pg_autovacuum documentation for the details of how these
 # parameters affect pg_autovacuum's aggressiveness.
 
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-8.0 b/dev-db/postgresql/files/pg_autovacuum.conf-8.0
index 45d436d9cfcf..7a745c9c4a47 100644
--- a/dev-db/postgresql/files/pg_autovacuum.conf-8.0
+++ b/dev-db/postgresql/files/pg_autovacuum.conf-8.0
@@ -4,6 +4,10 @@ PG_AUTOVACUUM_LOG="/var/lib/postgresql/data/pg_autovacuum.log"
 # PostgreSQL user
 PGUSER="postgres"
 
+# If you changed the default database port, you have to set
+# PGPORT to the new port number, otherwise pg_autovacuum won't work.
+#PGPORT=5432
+
 # See the pg_autovacuum documentation for the details of how these
 # parameters affect pg_autovacuum's aggressiveness.
 
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4 b/dev-db/postgresql/files/pg_autovacuum.init-7.4
index 2ad1ac621683..ec157a2f131b 100644
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4
+++ b/dev-db/postgresql/files/pg_autovacuum.init-7.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4,v 1.2 2006/11/07 22:48:22 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4,v 1.3 2006/11/11 13:39:14 dev-zero Exp $
 
 depend() {
 	need postgresql logger
@@ -27,7 +27,7 @@ start() {
 		fi
 	done
 
-	start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
+	start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D ${PGPORT:+-p ${PGPORT}} -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
 
 	sleep 1
 	pidof /usr/bin/pg_autovacuum > /dev/null
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-8.0 b/dev-db/postgresql/files/pg_autovacuum.init-8.0
index 2478fe96471a..a7b4cb979501 100644
--- a/dev-db/postgresql/files/pg_autovacuum.init-8.0
+++ b/dev-db/postgresql/files/pg_autovacuum.init-8.0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0,v 1.2 2006/11/07 22:48:22 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0,v 1.3 2006/11/11 13:39:14 dev-zero Exp $
 
 depend() {
 	need postgresql logger
@@ -27,7 +27,7 @@ start() {
 		fi
 	done
 
-	start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
+	start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D ${PGPORT:+-p ${PGPORT}} -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
 
 	sleep 1
 	pidof /usr/bin/pg_autovacuum > /dev/null