Bring localezcreate up-to-date with ezpublish 2.2.3-0.0.1. Correct apache config. Correct usage output.

1 files changed, 22 insertions, 10 deletions

diff --git a/localezcreate b/localezcreate
index 09c270f..cc84361 100755
--- a/localezcreate
+++ b/localezcreate
@@ -27,10 +27,10 @@ if [ $# \< 2 -o $# \> 8 ]; then
 	echo
 	echo "  dbuser:      MySQL database user"
 	echo "  host:        hostname (and only that - no dots!)"
-	echo "  fqdn:        Fully qualified domain name (default is <host>.$defaultdomain)"
+	echo "  fqdn:        Fully qualified domain name (default on this host is <host>.$defaultdomain)"
 	echo "  db:          MySQL database name"
 	echo "  mailuser:    User part of mail address (default is <dbuser>)"
-	echo "  maildomain:  Domain part of mail address (default is $defaultmailname)"
+	echo "  maildomain:  Domain part of mail address (default on this host is $defaultmaildomain)"
 	echo "  uid:         System user id (default is $defaultuid)"
 	echo "  gid:         System group id (default is <uid>"
 	echo "  dbpasswd:    MySQL database password (default is to ask for it)"
@@ -51,8 +51,8 @@ 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="data install www"
+#webdir="$srcdir/lib"
+tarballs="lib data install www"
 sqlfile="publish_mysql.sql"
 sqlfile2="data_mysql.sql"
 
@@ -85,8 +85,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 "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);"
@@ -98,6 +98,7 @@ cat $sqldir/$sqlfile | mysql -uroot -p$dbrootpw $db
 
 echo -n "Unpacking tarballs:"
 su $uid -c "
+	mkdir $basedir
 	for tarball in $tarballs; do
 		echo -n \" \$tarball\"
 		tar -xz -C $basedir -f $srcdir/\$tarball.tar.gz
@@ -152,11 +153,17 @@ echo "# Generated for $pkg by $(basename $0)
 	DocumentRoot	$basedir
 	user		$uid
 	group		$gid
+	<Directory $basedir>
+		Options		FollowSymLinks
+		AllowOverride	None 
+	</Directory>
 	php_flag	magic_quotes_gpc off
 	RewriteEngine	On
-	RewriteRule	^/stats/store/(.*).gif\$ $basedir/ezstats/user/storestats.php [S=2]
-	RewriteRule	^/filemanager/filedownload/([^/]+)/(.*)\$ $basedir/ezfilemanager/files/\$1 [T="application/oct-stream",S=1]
-	RewriteRule	!\.(gif|css|jpg|png)\$ $basedir/index.php
+	RewriteRule	^/stats/store/(.*).gif\$ $basedir/ezstats/user/storestats.php [S=4]
+	RewriteRule	^/filemanager/filedownload/([^/]+)/(.*)\$ $basedir/ezfilemanager/files/\$1 [T=\"application/oct-stream\",S=3]
+	RewriteRule	.*/ezmediacatalogue/catalogue/(.*)\$ $basedir/ezmediacatalogue/catalogue/\$1 [T=\"application/oct-stream\",S=2]
+	RewriteRule	^/xmlrpc.*\$  $basedir/index_xmlrpc.php [S=1]
+	RewriteRule	!\.(gif|css|jpg|png|jar)\$ $basedir/index.php
 </VirtualHost>
 <VirtualHost *>
 	ServerName	$adminhost
@@ -164,9 +171,14 @@ echo "# Generated for $pkg by $(basename $0)
 	DocumentRoot	$basedir
 	user		$uid
 	group		$gid
+	<Directory $basedir>
+		Options		FollowSymLinks
+		AllowOverride	None 
+	</Directory>
 	php_flag	magic_quotes_gpc off
 	RewriteEngine	On
-	RewriteRule	!\.(gif|css|jpg|png)\$ $basedir/index_admin.php
+	RewriteRule	.*/ezmediacatalogue/catalogue/(.*)\$ $basedir/ezmediacatalogue/catalogue/\$1 [T=\"application/oct-stream\",S=1]
+	RewriteRule     !\.(gif|css|jpg|png|jar) $basedir/index_admin.php
 </VirtualHost>
 <VirtualHost *>
 	ServerName	www.$fqdn