Changeset 3087

Timestamp:

09/21/11 15:04:57 (20 months ago)

Author:

benjamin

Message:

we replace the openbasedir to the document root by one on the root of relevant alternc account. Restore the behavior of pre-1.0 version. Now you can go back to the other behavior (1.0 one) by changing the vhost.conf template

Location:

alternc/branches/stable-1.0

Files:

• etc/alternc/templates/apache2/vhost.conf (modified) (1 diff)
• src/functions_hosting.sh (modified) (2 diffs)

alternc/branches/stable-1.0/etc/alternc/templates/apache2/vhost.conf

@@ -4 +4 @@
 
   <Directory "%%document_root%%">
-    php_admin_value open_basedir "%%document_root%%:/usr/share/php/:/var/alternc/tmp:/tmp"
+    php_admin_value open_basedir "%%account_root%%:/usr/share/php/:/var/alternc/tmp:/tmp"
     Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
     AllowOverride AuthConfig FileInfo Limit Options Indexes

alternc/branches/stable-1.0/src/functions_hosting.sh

@@ -59 +59 @@
     local user_letter=`print_user_letter "$USER"`
     local DOCUMENT_ROOT="${HTML_HOME}/${user_letter}/${USER}/$TARGET_DIR"
+    local ACCOUNT_ROOT="${HTML_HOME}/${user_letter}/${USER}/"
     local FILE_TARGET="$VHOST_DIR/${user_letter}/$USER/$FQDN.conf"
 
@@ -87 +88 @@
         -e "s#%%fqdn%%#$FQDN#g" \
         -e "s#%%document_root%%#$DOCUMENT_ROOT#g" \
+        -e "s#%%account_root%%#$ACCOUNT_ROOT#g" \
         -e "s#%%redirect%%#$REDIRECT#g" \
         $TMP_FILE