From b0603ce2846df8f9bf962919c2ed4d2dc2c68267 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 18 Oct 2011 12:03:01 +0000
Subject: [PATCH] tweak the pgsql major upgrade upgrade notes;

- use /etc/rc.d to stop and start the daemon.
- use sudo rather than keep jumping between root/_postgresql users.
- use pkg_add -ui rather than just -u (allow it to ask if you've backed
up, rather than just terminating).

ok pea@
---
 databases/postgresql/Makefile          |  3 ++-
 databases/postgresql/pkg/README-server | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index edfe9c45042..e61261e4456 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.157 2011/10/17 13:27:11 espie Exp $
+# $OpenBSD: Makefile,v 1.158 2011/10/18 12:03:01 sthen Exp $
 
 COMMENT-main=	PostgreSQL RDBMS (client)
 COMMENT-server=	PostgreSQL RDBMS (server)
@@ -9,6 +9,7 @@ VERSION=	9.1.1
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
+REVISION-server= 0
 PKGNAME-docs=	postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 
diff --git a/databases/postgresql/pkg/README-server b/databases/postgresql/pkg/README-server
index 2ba7118a82c..13fcd633a1e 100644
--- a/databases/postgresql/pkg/README-server
+++ b/databases/postgresql/pkg/README-server
@@ -1,4 +1,4 @@
-$OpenBSD: README-server,v 1.8 2011/09/23 09:46:14 pea Exp $
+$OpenBSD: README-server,v 1.9 2011/10/18 12:03:01 sthen Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@@ -122,36 +122,34 @@ Upgrade Howto (for a major upgrade)
 If you didn't install PostgreSQL by following this README, 
 you must adapt these instructions to your setup.
 
-Most commands must be launched as the user _postgresql:
-# su - _postgresql
-
 1) Backup all your data:
-$ pg_dumpall -U postgres > /var/postgresql/full.sqldump
+# sudo -u _postgresql pg_dumpall -U postgres > /var/postgresql/full.sqldump
 
 2) Shutdown the server:
-$ pg_ctl -D /var/postgresql/data/ stop -m fast
+# /etc/rc.d/postgresql stop
 
-3) As root, upgrade your PostgreSQL package with pkg_add.
-# pkg_add -u postgresql-server
+3) Upgrade your PostgreSQL package with pkg_add.
+# pkg_add -ui postgresql-server
 
 4) Backup your old data directory:
-$ mv /var/postgresql/data /var/postgresql/data.old
+# mv /var/postgresql/data /var/postgresql/data.old
 
 5) Create a new data directory:
-$ mkdir /var/postgresql/data
-$ initdb -D /var/postgresql/data -U postgres -A md5 -W
+# sudo -u _postgresql mkdir /var/postgresql/data
+# sudo -u _postgresql initdb -D /var/postgresql/data -U postgres -A md5 -W
 
 6) Restore your old pg_hba.conf
-$ cp /var/postgresql/data.old/pg_hba.conf /var/postgresql/data/
+# sudo -u _postgresql cp /var/postgresql/data.old/pg_hba.conf \
+    /var/postgresql/data/
 
 Some postgresql.conf settings changed or disappeared in this version.
 Examine your old file for local changes and apply them to the new version.
 
 7) Start PostgreSQL:
-$ pg_ctl -D /var/postgresql/data -l /var/postgresql/logfile start
+# /etc/rc.d/postgresql start
 
 8) Restore your data:
-$ psql -U postgres < /var/postgresql/full.sqldump
+# sudo -u _postgresql psql -U postgres < /var/postgresql/full.sqldump
 
 Clients/Frontends
 =================