OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 12-Jul-2009 00:20:17
Branch: HEAD Handle: 2009071123201300
Modified files:
openpkg-src/davical davical-setup.sh
Log:
use generated or specified admin password
Summary:
Revision Changes Path
1.3 +16 -2 openpkg-src/davical/davical-setup.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/davical/davical-setup.sh
============================================================================
$ cvs diff -u -r1.2 -r1.3 davical-setup.sh
--- openpkg-src/davical/davical-setup.sh 11 Jul 2009 21:12:19 -0000
1.2
+++ openpkg-src/davical/davical-setup.sh 11 Jul 2009 22:20:13 -0000
1.3
@@ -7,7 +7,7 @@
prg="$0"
if [ $# -eq 0 ]; then
echo "$prg:ERROR: invalid command line" 1>&2
- echo "$prg:USAGE: $prg install" 1>&2
+ echo "$prg:USAGE: $prg install [<admin-password>]" 1>&2
echo "$prg:USAGE: $prg uninstall" 1>&2
echo "$prg:USAGE: $prg edit" 1>&2
exit 1
@@ -30,12 +30,22 @@
shift
case "$cmd" in
install )
+ # determine admin password
+ admin_password="$1"
+ if [ ".$admin_password" = . ]; then
+ admin_password="`...@l_prefix@/bin/apg -Mncl -a1 -m12 -n1`"
+ echo "ATTENTION: using generated \"admin\" password:
\"$admin_password\"" 1>&2
+ fi
+
+ # create database
( echo "CREATE ROLE $db_user LOGIN ENCRYPTED PASSWORD '$db_pass'
NOCREATEDB NOCREATEUSER;"
echo "CREATE TABLESPACE $db_name OWNER $db_user LOCATION
'$db_dir';"
echo "CREATE DATABASE $db_name OWNER $db_user TABLESPACE $db_name
ENCODING 'UTF8';"
) | PGPASSWORD="$db_spass" @l_prefix@/bin/psql -q -U "$db_suser" -d
"$db_sname" -f-
PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" \
-c "CREATE LANGUAGE plpgsql;"
+
+ # create schema 1/2 (from original "create_database" script)
PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" -A -t \
-f "@l_prefix@/lib/davical/awl/dba/awl-tables.sql" 2>&1 | grep
-v NOTICE
PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" -A -t \
@@ -44,6 +54,8 @@
-f "@l_prefix@/lib/davical/davical/dba/davical.sql" 2>&1 | grep
-v NOTICE
PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" -A -t \
-f "@l_prefix@/lib/davical/davical/dba/base-data.sql" 2>&1 |
grep -v NOTICE
+
+ # create schema 2/2 (from original "update-davical-database"
script)
PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" -A -t \
-f "@l_prefix@/lib/davical/davical/dba/supported_locales.sql"
2>&1 | grep -v NOTICE
PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" -A -t \
@@ -52,8 +64,10 @@
-f "@l_prefix@/lib/davical/davical/dba/rrule_functions.sql" 2>&1
| egrep -v '(NOTICE|ERROR)'
PGPASSWORD="$db_spass" @l_prefix@/bin/psql -q -U "$db_suser" -d
"$db_name" -A -t \
-f "@l_prefix@/lib/davical/davical/dba/appuser_permissions.txt"
2>&1 | grep -v NOTICE
+
+ # set admin password
PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" \
- -c "UPDATE usr SET password = '**davical' WHERE user_no = 1;"
+ -c "UPDATE usr SET password = '**$admin_password' WHERE user_no
= 1;"
;;
uninstall )
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
