diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2003-04-25 04:07:17 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2003-04-25 04:07:17 +0000 |
| commit | 9a79186772cb65428e5202d41708b4579266848c (patch) | |
| tree | 98f7ffc3bbf2e70d90325dd41be14ae8c944cf4b /localezcreate | |
| parent | 333a4f4452ac4e977149455c449f45337c371e86 (diff) | |
Use underscores for defaultdbname. Drop dbmatch parameter.
Diffstat (limited to 'localezcreate')
| -rwxr-xr-x | localezcreate | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/localezcreate b/localezcreate index 8d94486..c926b64 100755 --- a/localezcreate +++ b/localezcreate @@ -3,7 +3,7 @@ # /usr/local/sbin/localezcreate # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: localezcreate,v 1.24 2002-12-30 17:53:47 jonas Exp $ +# $Id: localezcreate,v 1.25 2003-04-25 04:07:17 jonas Exp $ # # Create local eZ Publish site # @@ -20,7 +20,7 @@ set -e prg=`basename $0` -TEMP=`getopt -o hu:g:d:a:m:N:M:U:D:Z:i::v::q::f:: --long help,user:,group:,domain:,mailuser:,maildomain:,dbname:,dbmatch:,dbuser:,dbserver:,dballow:,info::,verbose::,debug::,query::,force:: -n "$prg" -- "$@"` +TEMP=`getopt -o hu:g:d:a:m:N:U:D:Z:i::v::q::f:: --long help,user:,group:,domain:,mailuser:,maildomain:,dbname:,dbuser:,dbserver:,dballow:,info::,verbose::,debug::,query::,force:: -n "$prg" -- "$@"` # Check for non-GNU getopt if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi @@ -31,7 +31,7 @@ eval set -- "$TEMP" # (If changing defaults, you might need to change these as well) opts1="user group domain maildomain dbserver dballow templates languages sqlchunks templatedirs languagedirs sqldirs" # Options with self-contained defaults opts2="dbuser home" # Options requiring $opts1 to resolve default -opts3="mailuser dbname dbmatch basedir adminhost webcfg" # Options requiring $opts1, $opts2 or $host to resolve default +opts3="mailuser dbname basedir adminhost webcfg" # Options requiring $opts1, $opts2 or $host to resolve default optsboolean="debug verbose info query force" # Do not touch these! # Defaults @@ -40,8 +40,7 @@ defaultgroup="www-data" defaultdomain="ez."`hostname -d` defaultmailuser='$dbuser' defaultmaildomain=`cat /etc/mailname 2> /dev/null || hostname -d` -defaultdbname='$dbuser-ez-$host' -defaultdbmatch='$dbuser%' +defaultdbname='$dbuser_ez_$host' defaultdbuser='$user' defaultdbserver="localhost" defaultdballow="localhost" @@ -91,8 +90,6 @@ function usage() { echo " $defaultmaildomain)" echo " -N, --dbname=DB MySQL database name (default:" echo " $defaultdbname)" - echo " -M, --dbmatch=STRING MySQL database authorization match (default:" - echo " $defaultdbmatch)" echo " -U, --dbuser=UID MySQL database user (default: $defaultdbuser)" echo " -D, --dbserver=HOST IP or host of MySQL server (default:" echo " $defaultdbserver)" @@ -143,7 +140,6 @@ while true ; do -a|--mailuser) mailuser="$2"; shift 2;; -m|--maildomain) maildomain="$2"; shift2 ;; -N|--dbname) dbname="$2"; shift 2;; - -M|--dbmatch) dbmatch="$2"; shift 2;; -U|--dbuser) dbuser="$2"; shift 2;; -D|--dbserver) dbserver="$2"; shift 2;; -Z|--dballow) dballow="$2"; shift 2;; @@ -301,11 +297,11 @@ if [ -e /usr/share/wwwconfig-common/mysql-createuser.sh ] ; then exit 1 fi for h in `echo "localhost $dballow" | sort -u`; do - echo "GRANT INDEX ON '$dbmatch' TO '$dbuser'@'$h';" | mysql -u$dbadmin -p$dbadmpass $optdbserver + echo "GRANT INDEX ON $dbname.* TO '$dbuser'@'$h';" | mysql -u$dbadmin -p$dbadmpass $optdbserver mysql done else for h in `echo "localhost $dballow" | sort -u`; do - echo "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON '$dbmatch' TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" | mysql -u$dbadmin -p$dbadmpass $optdbserver + echo "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" | mysql -u$dbadmin -p$dbadmpass $optdbserver mysql done fi |