last fixes and fix variables name

web/add_site.sh

@@ -5,6 +5,7 @@ test "$1" || exit 1
 test "$2" || exit 1
 USERNAME=$2
 DOMAINNAME=$(echo "$1" | tr [A-Z] [a-z])
+ALIASLIST=
 
 . ./config
 . ./functions
@@ -39,17 +40,17 @@ if [ ! -d "$LOGDIR" ] ; then
 fi
 
 #mkdir -p $SITE/cgi
-mkdir -p $SITE
+mkdir -p $SITEDIR
 #mkdir -p $LOGDIR
 #test -f $SITE/favicon.ico || cp -f ./favicon.ico $SITE/favicon.ico
-test -f $SITE/favicon.ico || touch $SITE/favicon.ico
-touch $SITE/robots.txt
+test -f $SITEDIR/favicon.ico || touch $SITEDIR/favicon.ico
+touch $SITEDIR/robots.txt
 # due nscd?
-chown -R $2:webmaster $SITE/ || { sleep 10; chown -R $2:webmaster $SITE/ ; }
+chown -R $2:webmaster $SITEDIR/ || { sleep 10; chown -R $2:webmaster $SITEDIR/ ; }
 #chmod o+r $SITE/robots.txt $SITE/favicon.ico
-chmod g+rwx $SITE/
-chmod o-rwx $SITE/
-chmod g+s $SITE/
+chmod g+rwx $SITEDIR/
+chmod o-rwx $SITEDIR/
+chmod g+s $SITEDIR/
 
 check_dirs
 

web/functions

@@ -9,7 +9,8 @@ set_vars()
     USERTMPDIR=$HOMEDIR/tmp
     SESSIONDIR=$USERTMPDIR/session/$DOMAINNAME
     TECHNAME=`echo $DOMAINNAME | sed -e "s|\..*||g"`
-    SITE=$HOSTBASE/$DOMAINNAME
+    TECHALIAS=$TECHNAME.$TECHHOST
+    SITEDIR=$HOSTBASE/$DOMAINNAME
 }
 
 check_dir()
@@ -22,7 +23,7 @@ check_dir()
 
 check_dirs()
 {
-    for i in HOSTBASE LOGDIR USERTMPDIR SESSIONDIR SITE ; do
+    for i in HOSTBASE LOGDIR USERTMPDIR SESSIONDIR SITEDIR ; do
         check_dir $i
     done
 }
@@ -30,7 +31,11 @@ check_dirs()
 # needs: DOMAINNAME
 create_site_config()
 {
-PHPINCLUDE=/etc/httpd2/conf/include
+local aliaslist=
+# for get space before
+[ -n "$ALIASLIST" ] && aliaslist=" $ALIASLIST"
+
+local PHPINCLUDE=/etc/httpd2/conf/include
 [ -r $PHPINCLUDE/prepend.php ] || echo "<?php putenv('TMPDIR='.ini_get('upload_tmp_dir'));" >$PHPINCLUDE/prepend.php
 cat <<EOF >$DOMAINNAME.conf
 #NameVirtualHost *
@@ -38,14 +43,16 @@ cat <<EOF >$DOMAINNAME.conf
 # ----- $1 -----
 <VirtualHost *>
     ServerName $DOMAINNAME
-    ServerAlias www.$DOMAINNAME $TECHNAME.$TECHHOST
+    ServerAlias www.$DOMAINNAME $TECHALIAS$aliaslist
     AssignUserID $USERNAME $USERNAME
     php_admin_value session.save_path "$SESSIONDIR"
-    php_admin_value open_basedir "$SITE:$USERTMPDIR:$PHPINCLUDE"
+    # Due http://drupal.stackexchange.com/questions/10646/i-get-tmp-is-not-writeable-by-the-webserver-on-migration
+    # NOTE: /tmp for open_basedir
+    php_admin_value open_basedir "$SITEDIR:$USERTMPDIR:$PHPINCLUDE:/tmp"
     php_admin_value upload_tmp_dir "$USERTMPDIR"
     php_admin_value auto_prepend_file "$PHPINCLUDE/prepend.php"
     ServerAdmin $ADMINMAIL
-    DocumentRoot "$SITE"
+    DocumentRoot "$SITEDIR"
     ErrorLog $LOGDIR/${TECHNAME}_error.log
     CustomLog $LOGDIR/${TECHNAME}_access.log common
 </VirtualHost>