Fixing 8.5 init scripts, adding PG_EXTRA_OPTS to 8.4 for #273867

(Portage version: 2.2_rc61/cvs/Linux x86_64)

5 files changed, 18 insertions, 10 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 0928b6c6302b..26c4ab6d0ba3 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.51 2010/01/26 19:26:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.52 2010/01/26 21:04:57 patrick Exp $
+
+  26 Jan 2010; Patrick Lauer <patrick@gentoo.org> files/postgresql.conf-8.4,
+  files/postgresql.init-8.4, files/postgresql.conf-8.5,
+  files/postgresql.init-8.5:
+  Fixing 8.5 init scripts, adding PG_EXTRA_OPTS to 8.4 for #273867
 
 *postgresql-server-8.5_alpha3 (26 Jan 2010)
 
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.4 b/dev-db/postgresql-server/files/postgresql.conf-8.4
index 22ff61cd37d6..1f1cf1a1c898 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.4
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.4
@@ -14,6 +14,8 @@ PGGROUP="postgres"
 # can be set directly in the configuration-file.
 #PGOPTS="-N 512 -B 1024"
 
+# Pass extra environment variables 
+#PG_EXTRA_ENV=""
 
 # SERVER SHUTDOWN:
 # The server will receive 3 signals in the worst case:
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.5 b/dev-db/postgresql-server/files/postgresql.conf-8.5
index 22ff61cd37d6..957c4ab5708b 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.5
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.5
@@ -1,5 +1,5 @@
 # PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/8.4/data"
+PGDATA="/var/lib/postgresql/8.5/data"
 
 # PostgreSQL User
 PGUSER="postgres"
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.4 b/dev-db/postgresql-server/files/postgresql.init-8.4
index 5ebd3034e0ac..11ac45d8bbba 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.4
+++ b/dev-db/postgresql-server/files/postgresql.init-8.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4,v 1.2 2010/01/06 23:36:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4,v 1.3 2010/01/26 21:04:58 patrick Exp $
 
 opts="${opts} reload"
 
@@ -34,7 +34,8 @@ start() {
 	local retval
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} \
+		-o '--silent-mode=true ${PGOPTS}'" ${PG_EXTRA_ENV}
 	retval=$?
 	[ $retval -ne 0 ] && eend $retval && return $retval
 
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.5 b/dev-db/postgresql-server/files/postgresql.init-8.5
index 890582496052..ce5055af4965 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.5
+++ b/dev-db/postgresql-server/files/postgresql.init-8.5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5,v 1.1 2010/01/26 19:26:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5,v 1.2 2010/01/26 21:04:58 patrick Exp $
 
 opts="${opts} reload"
 
@@ -34,7 +34,7 @@ start() {
 	local retval
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
 	retval=$?
 	[ $retval -ne 0 ] && eend $retval && return $retval
 
@@ -59,7 +59,7 @@ stop() {
 	local retval
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
 
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
@@ -68,7 +68,7 @@ stop() {
 	ewarn "Going to shutdown the server anyway."
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m fast"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl stop -m fast"
 
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
@@ -83,7 +83,7 @@ stop() {
 	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m immediate"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl stop -m immediate"
 
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
@@ -95,6 +95,6 @@ stop() {
 reload() {
 	ebegin "Reloading PostgreSQL configuration"
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl reload"	
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl reload"	
 	eend $?
 }