From d8f4de6ee8fc8540ac77abdbb4e25e04034cde8e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 9 Apr 2002 23:04:25 +0000 Subject: Remove old commented out code from localezcreate. --- localezcreate | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'localezcreate') diff --git a/localezcreate b/localezcreate index b10725f..6348a04 100755 --- a/localezcreate +++ b/localezcreate @@ -3,7 +3,7 @@ # /usr/local/sbin/localezcreate # Copyright 2001-2002 Jonas Smedegaard # -# $Id: localezcreate,v 1.5 2002-03-07 16:22:51 jonas Exp $ +# $Id: localezcreate,v 1.6 2002-04-09 23:04:25 jonas Exp $ # # Create local eZ Publish site # @@ -11,7 +11,7 @@ set -e # Defaults -defaultmaildomain=`dnsdomainname` +defaultmaildomain=`hostname -d` defaultdomain="ez.$defaultmaildomain" defaultuid="www-data" @@ -25,29 +25,27 @@ maildomain="$6" uid="$7" gid="$8" dbpasswd="$9" -#ezpasswd="$10" if [ $# \< 2 -o $# \> 9 ]; then echo "\$#: $#" -# echo "Usage: `basename $0` dbuser host [fqdn [db [mailuser [maildomain [ uid [ gid [dbpasswd [ezpasswd]]]]]]]]" echo "Usage: `basename $0` dbuser host [fqdn [db [mailuser [maildomain [ uid [ gid [dbpasswd ]]]]]]]" echo echo " dbuser: MySQL database user" echo " host: hostname (and only that - no dots!)" - echo " fqdn: Fully qualified domain name (default on this host is .$defaultdomain)" + echo " fqdn: Fully qualified domain name (default here is .$defaultdomain)" echo " db: MySQL database name" echo " mailuser: User part of mail address (default is )" - echo " maildomain: Domain part of mail address (default on this host is $defaultmaildomain)" + echo " maildomain: Domain part of mail address (default here is $defaultmaildomain)" echo " uid: System user id (default is $defaultuid)" echo " gid: System group id (default is " echo " dbpasswd: MySQL database password (default is to ask for it)" -# echo " ezpasswd: Web password (default is to ask for it)" echo echo " Example: `basename $0` bilbo news news.forum.com" exit 1 fi +# Attempt to find MySQL root password if [ -f /root/.my.cnf ]; then dbrootpw=$(grep password /root/.my.cnf | awk -F= '{print $2}' | head -1 | sed 's/^ //g') else @@ -57,10 +55,8 @@ else fi pkg="ezpublish" -#src="/usr/local/src/$pkg/ezpublish_2_2_beta_1.tar.gz" srcdir="/usr/share/ezpublish" sqldir="$srcdir/sql" -#webdir="$srcdir/lib" tarballs="lib data install www" sqlfile="publish_mysql.sql" sqlfile2="data_mysql.sql" @@ -76,11 +72,6 @@ if [ "x$dbpasswd" == "x" ]; then read -s dbpasswd echo fi -#if [ "x$ezpasswd" == "x" ]; then -# echo -n "Enter eZ admin password for $dbuser: " -# read -s ezpasswd -# echo -#fi home=`getent passwd $uid | awk -F: '{print $6}';` basedir="$home/web_$fqdn" adminhost="admin.$fqdn" @@ -98,16 +89,8 @@ echo "Creating database $db" mysqladmin -uroot -p$dbrootpw create $db echo "GRANT SELECT,INSERT,UPDATE,DELETE ON $db.* TO '$dbuser'@localhost IDENTIFIED BY '$dbpasswd';" | mysql -uroot -p$dbrootpw -#echo "Copying initial files to $basedir" -#su $uid -c "cp -a $webdir $basedir" - -echo "Adding initial data to database" -#dbstring="INSERT INTO eZUser_User VALUES (1,'$dbuser',password('$ezpasswd'),'$dbuser@$maildomain','admin','user','false','',0,0);" -#cat $sqldir/$sqlfile | sed "s/^INSERT INTO eZUser_User VALUES.*\$/$dbstring/" | mysql -uroot -p$dbrootpw $db -#cat $sqldir/$sqlfile | sed "s/'0c947f956f7aa781','postmaster@yourdomain'/password('$ezpasswd'),'$dbuser@$maildomain'/" | mysql -uroot -p$dbrootpw $db +echo "Inject initial data into database" cat $sqldir/$sqlfile | mysql -uroot -p$dbrootpw $db -#cat $basedir/sql/publish.sql | sed -e "s/^INSERT INTO eZUser_User VALUES.*\$/$dbstring/" -e 's/ PACK_KEYS=1//' | mysql -uroot -p$dbrootpw $db -#su $uid -c "zcat $basedir/data.tar.gz | tar -xv -C $basedir" echo -n "Unpacking tarballs:" su $uid -c " @@ -121,7 +104,6 @@ su $uid -c " " echo "Adding demo data to database" -#su - $uid -c "mysql -u$dbuser -p$dbpasswd $db < $sqldir/$sqlfile2" mysql -u$dbuser -p$dbpasswd $db < $sqldir/$sqlfile2 echo "Configuring website" -- cgit v1.2.3