mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-02 01:41:16 +02:00
Made some changes to clean up how initdb works...just more made a 'PGSQL_OPTS'
variable that can be set in one place to affect everything...
This commit is contained in:
parent
8dd692c8e3
commit
0279d55eef
@ -26,7 +26,7 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
# IDENTIFICATION
|
# IDENTIFICATION
|
||||||
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.39 1998/03/22 18:28:39 scrappy Exp $
|
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.40 1998/03/22 19:35:30 scrappy Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -346,13 +346,14 @@ fi
|
|||||||
|
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
PGSQL_OPT="-o /dev/null -F -Q -D$PGDATA"
|
||||||
|
|
||||||
# If the COPY is first, the VACUUM generates an error, so we vacuum first
|
# If the COPY is first, the VACUUM generates an error, so we vacuum first
|
||||||
echo "vacuuming template1"
|
echo "vacuuming template1"
|
||||||
echo "vacuum" | postgres -o /dev/null -F -Q -D$PGDATA template1
|
echo "vacuum" | postgres $PGSQL_OPT template1 > /dev/null
|
||||||
|
|
||||||
echo "COPY pg_shadow TO '$PGDATA/pg_pwd' USING DELIMITERS '\\t'" |\
|
echo "COPY pg_shadow TO '$PGDATA/pg_pwd' USING DELIMITERS '\\t'" | \
|
||||||
postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
|
postgres $PGSQL_OPT template1 > /dev/null
|
||||||
grep -v "'DEBUG:"
|
|
||||||
|
|
||||||
echo "creating public pg_user view"
|
echo "creating public pg_user view"
|
||||||
echo "CREATE TABLE xpg_user ( \
|
echo "CREATE TABLE xpg_user ( \
|
||||||
@ -363,30 +364,27 @@ echo "CREATE TABLE xpg_user ( \
|
|||||||
usesuper bool, \
|
usesuper bool, \
|
||||||
usecatupd bool, \
|
usecatupd bool, \
|
||||||
passwd text, \
|
passwd text, \
|
||||||
valuntil abstime);" |\
|
valuntil abstime);" | postgres $PGSQL_OPT template1 > /dev/null
|
||||||
postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
|
|
||||||
grep -v "'DEBUG:"
|
|
||||||
|
|
||||||
#move it into pg_user
|
#move it into pg_user
|
||||||
echo "UPDATE pg_class SET relname = 'pg_user' WHERE relname = 'xpg_user';" |\
|
echo "UPDATE pg_class SET relname = 'pg_user' WHERE relname = 'xpg_user';" |\
|
||||||
postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
|
postgres $PGSQL_OPT template1 > /dev/null
|
||||||
grep -v "'DEBUG:"
|
|
||||||
echo "UPDATE pg_type SET typname = 'pg_user' WHERE typname = 'xpg_user';" |\
|
echo "UPDATE pg_type SET typname = 'pg_user' WHERE typname = 'xpg_user';" |\
|
||||||
postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
|
postgres $PGSQL_OPT template1 > /dev/null
|
||||||
grep -v "'DEBUG:"
|
|
||||||
mv $PGDATA/base/template1/xpg_user $PGDATA/base/template1/pg_user
|
mv $PGDATA/base/template1/xpg_user $PGDATA/base/template1/pg_user
|
||||||
|
|
||||||
echo "CREATE RULE _RETpg_user AS ON SELECT TO pg_user DO INSTEAD \
|
echo "CREATE RULE _RETpg_user AS ON SELECT TO pg_user DO INSTEAD \
|
||||||
SELECT usename, usesysid, usecreatedb, usetrace, \
|
SELECT usename, usesysid, usecreatedb, usetrace, \
|
||||||
usesuper, usecatupd, '********'::text as passwd, \
|
usesuper, usecatupd, '********'::text as passwd, \
|
||||||
valuntil FROM pg_shadow;" |\
|
valuntil FROM pg_shadow;" | \
|
||||||
postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
|
postgres $PGSQL_OPT template1 > /dev/null
|
||||||
grep -v "'DEBUG:"
|
echo "REVOKE ALL on pg_shadow FROM public" | \
|
||||||
echo "REVOKE ALL on pg_shadow FROM public" |\
|
postgres $PGSQL_OPT template1 > /dev/null
|
||||||
postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
|
|
||||||
grep -v "'DEBUG:"
|
|
||||||
|
|
||||||
echo "loading pg_description"
|
echo "loading pg_description"
|
||||||
echo "copy pg_description from '$TEMPLATE_DESCR'" | postgres -F -Q -D$PGDATA template1 > /dev/null
|
echo "copy pg_description from '$TEMPLATE_DESCR'" | \
|
||||||
echo "copy pg_description from '$GLOBAL_DESCR'" | postgres -F -Q -D$PGDATA template1 > /dev/null
|
postgres $PGSQL_OPT template1 > /dev/null
|
||||||
echo "vacuum analyze" | postgres -o /dev/null -F -Q -D$PGDATA template1
|
echo "copy pg_description from '$GLOBAL_DESCR'" | \
|
||||||
|
postgres $PGSQL_OPT template1 > /dev/null
|
||||||
|
echo "vacuum analyze" | \
|
||||||
|
postgres $PGSQL_OPT template1 > /dev/null
|
||||||
|
Loading…
Reference in New Issue
Block a user