From 5b7693ee231e55eb25600efc9fb2b74f968de5cd Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 29 Jul 2011 10:23:34 +0300 Subject: [PATCH] web directiry change --- bin/v_add_sys_user | 6 +-- bin/v_add_web_domain | 54 ++++++++++++------------ bin/v_add_web_domain_cgi | 4 +- bin/v_add_web_domain_nginx | 6 +-- bin/v_add_web_domain_ssl | 4 +- bin/v_add_web_domain_stat_auth | 2 +- bin/v_change_web_domain_sslhome | 8 ++-- bin/v_change_web_domain_tpl | 6 +-- bin/v_del_web_domain | 4 +- bin/v_del_web_domain_cgi | 4 +- bin/v_del_web_domain_stat | 2 +- bin/v_del_web_domain_stat_auth | 2 +- bin/v_rebuild_web_domains | 10 ++--- bin/v_unsuspend_web_domain | 6 +-- bin/v_unsuspend_web_domains | 6 +-- bin/v_upd_web_domain_disk | 2 +- bin/v_upd_web_domains_disk | 2 +- data/templates/apache_default.stpl | 10 ++--- data/templates/apache_default.tpl | 10 ++--- data/templates/apache_phpcgi.sh | 2 +- data/templates/apache_phpcgi.stpl | 10 ++--- data/templates/apache_phpcgi.tpl | 8 ++-- data/templates/apache_unlim.stpl | 8 ++-- data/templates/apache_unlim.tpl | 8 ++-- data/templates/awstats.tpl | 2 +- data/templates/ngingx_vhost_default.stpl | 2 +- data/templates/ngingx_vhost_default.tpl | 2 +- data/templates/webalizer.tpl | 4 +- 28 files changed, 97 insertions(+), 97 deletions(-) diff --git a/bin/v_add_sys_user b/bin/v_add_sys_user index b5a57c5ef..1128c7ae3 100755 --- a/bin/v_add_sys_user +++ b/bin/v_add_sys_user @@ -82,12 +82,12 @@ fi if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then mkdir $V_HOME/$user/conf - mkdir $V_HOME/$user/domains + mkdir $V_HOME/$user/web mkdir $V_HOME/$user/tmp chmod 751 $V_HOME/$user/conf - chmod 751 $V_HOME/$user/domains + chmod 751 $V_HOME/$user/web chmod 777 $V_HOME/$user/tmp - chown $user:$user $V_HOME/$user/domains + chown $user:$user $V_HOME/$user/web fi if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain index 5075e0c45..249c48768 100755 --- a/bin/v_add_web_domain +++ b/bin/v_add_web_domain @@ -84,7 +84,7 @@ fi web_port=$(get_config_value '$WEB_PORT') group="$user" email="$user@$domain" -docroot="$V_HOME/$user/domains/$domain/public_html" +docroot="$V_HOME/$user/web/$domain/public_html" conf="$V_HOME/$user/conf/httpd.conf" tpl_file="$V_WEBTPL/apache_$template.tpl" @@ -105,14 +105,14 @@ fi add_web_config # Building directory tree -mkdir $V_HOME/$user/domains/$domain \ - $V_HOME/$user/domains/$domain/public_html \ - $V_HOME/$user/domains/$domain/public_shtml \ - $V_HOME/$user/domains/$domain/document_errors \ - $V_HOME/$user/domains/$domain/cgi-bin \ - $V_HOME/$user/domains/$domain/private \ - $V_HOME/$user/domains/$domain/stats \ - $V_HOME/$user/domains/$domain/logs +mkdir $V_HOME/$user/web/$domain \ + $V_HOME/$user/web/$domain/public_html \ + $V_HOME/$user/web/$domain/public_shtml \ + $V_HOME/$user/web/$domain/document_errors \ + $V_HOME/$user/web/$domain/cgi-bin \ + $V_HOME/$user/web/$domain/private \ + $V_HOME/$user/web/$domain/stats \ + $V_HOME/$user/web/$domain/logs # Adding domain logs touch /var/log/httpd/domains/$domain.bytes \ @@ -120,35 +120,35 @@ touch /var/log/httpd/domains/$domain.bytes \ /var/log/httpd/domains/$domain.error.log # Adding symlink for logs -ln -s /var/log/httpd/domains/$domain.*log $V_HOME/$user/domains/$domain/logs/ +ln -s /var/log/httpd/domains/$domain.*log $V_HOME/$user/web/$domain/logs/ # Adding domain skeleton -cp -r $V_WEBTPL/skel/public_html/ $V_HOME/$user/domains/$domain/ -cp -r $V_WEBTPL/skel/public_shtml/ $V_HOME/$user/domains/$domain/ -cp -r $V_WEBTPL/skel/document_errors/ $V_HOME/$user/domains/$domain/ -cp -r $V_WEBTPL/skel/cgi-bin/ $V_HOME/$user/domains/$domain/ +cp -r $V_WEBTPL/skel/public_html/ $V_HOME/$user/web/$domain/ +cp -r $V_WEBTPL/skel/public_shtml/ $V_HOME/$user/web/$domain/ +cp -r $V_WEBTPL/skel/document_errors/ $V_HOME/$user/web/$domain/ +cp -r $V_WEBTPL/skel/cgi-bin/ $V_HOME/$user/web/$domain/ # Changing tpl values -for file in $(find "$V_HOME/$user/domains/$domain/" -type f); do +for file in $(find "$V_HOME/$user/web/$domain/" -type f); do sed -i "s/%domain%/$domain/g" $file done # Changing file owner -chown -R $user:$user $V_HOME/$user/domains/$domain +chown -R $user:$user $V_HOME/$user/web/$domain chown root:$user /var/log/httpd/domains/$domain.* # Changing file permissions -chmod 551 $V_HOME/$user/domains/$domain -chmod 751 $V_HOME/$user/domains/$domain/private -chmod 751 $V_HOME/$user/domains/$domain/cgi-bin -chmod 751 $V_HOME/$user/domains/$domain/public_html -chmod 751 $V_HOME/$user/domains/$domain/public_shtml -chmod 751 $V_HOME/$user/domains/$domain/document_errors -chmod -f -R 775 $V_HOME/$user/domains/$domain/cgi-bin/* -chmod -f -R 775 $V_HOME/$user/domains/$domain/public_html/* -chmod -f -R 775 $V_HOME/$user/domains/$domain/document_errors/* -chmod 551 $V_HOME/$user/domains/$domain/stats -chmod 551 $V_HOME/$user/domains/$domain/logs +chmod 551 $V_HOME/$user/web/$domain +chmod 751 $V_HOME/$user/web/$domain/private +chmod 751 $V_HOME/$user/web/$domain/cgi-bin +chmod 751 $V_HOME/$user/web/$domain/public_html +chmod 751 $V_HOME/$user/web/$domain/public_shtml +chmod 751 $V_HOME/$user/web/$domain/document_errors +chmod -f -R 775 $V_HOME/$user/web/$domain/cgi-bin/* +chmod -f -R 775 $V_HOME/$user/web/$domain/public_html/* +chmod -f -R 775 $V_HOME/$user/web/$domain/document_errors/* +chmod 551 $V_HOME/$user/web/$domain/stats +chmod 551 $V_HOME/$user/web/$domain/logs chmod 640 /var/log/httpd/domains/$domain.* # Running template trigger diff --git a/bin/v_add_web_domain_cgi b/bin/v_add_web_domain_cgi index ccd99be2c..2293f93f3 100755 --- a/bin/v_add_web_domain_cgi +++ b/bin/v_add_web_domain_cgi @@ -56,7 +56,7 @@ tpl_file="$V_WEBTPL/apache_$tpl_name.tpl" # Defining params for ScriptAlias conf="$V_HOME/$user/conf/httpd.conf" search_phrase='ScriptAlias ' -str_repl=" ScriptAlias /cgi-bin/ $V_HOME/$user/domains/$domain/cgi-bin/" +str_repl=" ScriptAlias /cgi-bin/ $V_HOME/$user/web/$domain/cgi-bin/" change_web_config # Defining params for Options @@ -72,7 +72,7 @@ if [ ! -z "$cert" ]; then tpl_file="$V_WEBTPL/apache_$tpl_name.stpl" conf="$V_HOME/$user/conf/shttpd.conf" search_phrase='ScriptAlias ' - str_repl=" ScriptAlias /cgi-bin/ $V_HOME/$user/domains/$domain/cgi-bin/" + str_repl=" ScriptAlias /cgi-bin/ $V_HOME/$user/web/$domain/cgi-bin/" change_web_config # Defining params for Options diff --git a/bin/v_add_web_domain_nginx b/bin/v_add_web_domain_nginx index 68df11bd1..5c809915c 100755 --- a/bin/v_add_web_domain_nginx +++ b/bin/v_add_web_domain_nginx @@ -62,7 +62,7 @@ web_port=$(get_config_value '$WEB_PORT') proxy_port=$(get_config_value '$PROXY_PORT') domain_idn=$(idn -t --quiet -a "$domain") group="$user" -docroot="$V_HOME/$user/domains/$domain/public_html" +docroot="$V_HOME/$user/web/$domain/public_html" email="$user@$domain" aliases=$(get_web_domain_value '$ALIAS') aliases_idn=$(idn -t --quiet -a "$aliases") @@ -95,8 +95,8 @@ if [ ! -z "$cert" ]; then ssl_key="$V_HOME/$user/conf/$cert.key" tpl_option=$(get_web_domain_value '$SSL_HOME') case $tpl_option in - single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; - same) docroot="$V_HOME/$user/domains/$domain/public_html" ;; + single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;; + same) docroot="$V_HOME/$user/web/$domain/public_html" ;; *) check_args '3' "$#" 'user domain certificate [sslhome]' esac web_ssl_port=$(get_config_value '$WEB_SSL_PORT') diff --git a/bin/v_add_web_domain_ssl b/bin/v_add_web_domain_ssl index d4c22a342..b8ba6bde1 100755 --- a/bin/v_add_web_domain_ssl +++ b/bin/v_add_web_domain_ssl @@ -75,8 +75,8 @@ email="$user@$domain" ssl_cert="$V_HOME/$user/conf/$cert.crt" ssl_key="$V_HOME/$user/conf/$cert.key" case $tpl_option in - single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; - same) docroot="$V_HOME/$user/domains/$domain/public_html" ;; + single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;; + same) docroot="$V_HOME/$user/web/$domain/public_html" ;; *) check_args '3' "$#" 'user domain certificate [sslhome]' esac group="$user" diff --git a/bin/v_add_web_domain_stat_auth b/bin/v_add_web_domain_stat_auth index 8d8c32728..5c224631a 100755 --- a/bin/v_add_web_domain_stat_auth +++ b/bin/v_add_web_domain_stat_auth @@ -48,7 +48,7 @@ is_domain_suspended 'web_domains' #----------------------------------------------------------# # Definining statistic dir -stat_dir="$V_HOME/$user/domains/$domain/stats" +stat_dir="$V_HOME/$user/web/$domain/stats" # Adding htaccess file if [ ! -e "$stat_dir/.htaccess" ]; then diff --git a/bin/v_change_web_domain_sslhome b/bin/v_change_web_domain_sslhome index da11cc283..4eea5163a 100755 --- a/bin/v_change_web_domain_sslhome +++ b/bin/v_change_web_domain_sslhome @@ -62,8 +62,8 @@ search_phrase='DocumentRoot' # Parsing tpl_option case $tpl_option in - single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; - same) docroot="$V_HOME/$user/domains/$domain/public_html" ;; + single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;; + same) docroot="$V_HOME/$user/web/$domain/public_html" ;; *) check_args '3' "2" 'user domain sslhome' esac @@ -78,8 +78,8 @@ ssl_home=$(get_web_domain_value '$SSL_HOME') # Parsing old sslhome case $ssl_home in - single) dirroot="$V_HOME/$user/domains/$domain/public_shtml" ;; - same) dirroot="$V_HOME/$user/domains/$domain/public_html" ;; + single) dirroot="$V_HOME/$user/web/$domain/public_shtml" ;; + same) dirroot="$V_HOME/$user/web/$domain/public_html" ;; *) check_args '3' "2" 'user domain sslhome' esac diff --git a/bin/v_change_web_domain_tpl b/bin/v_change_web_domain_tpl index 4397e4178..95a1ae4d0 100755 --- a/bin/v_change_web_domain_tpl +++ b/bin/v_change_web_domain_tpl @@ -77,7 +77,7 @@ aliases=$(get_web_domain_value '$ALIAS') aliases_idn=$(idn -t --quiet -a "$aliases") web_port=$(get_config_value '$WEB_PORT') email="$user@$domain" -docroot="$V_HOME/$user/domains/$domain/public_html" +docroot="$V_HOME/$user/web/$domain/public_html" conf="$V_HOME/$user/conf/httpd.conf" tpl_file="$V_WEBTPL/apache_$template.tpl" group="$user" @@ -111,8 +111,8 @@ if [ ! -z "$cert" ]; then ssl_cert="$V_HOME/$user/conf/$cert.crt" ssl_key="$V_HOME/$user/conf/$cert.key" case $tpl_option in - single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; - *) docroot="$V_HOME/$user/domains/$domain/public_html" ;; + single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;; + *) docroot="$V_HOME/$user/web/$domain/public_html" ;; esac conf="$V_HOME/$user/conf/shttpd.conf" tpl_file="$V_WEBTPL/apache_$template.stpl" diff --git a/bin/v_del_web_domain b/bin/v_del_web_domain index 8d75c17d8..fcf845a42 100755 --- a/bin/v_del_web_domain +++ b/bin/v_del_web_domain @@ -55,7 +55,7 @@ conf="$V_HOME/$user/conf/httpd.conf" # Deleting domain del_web_config -exit + # Checking ssl cert=$(get_web_domain_value '$SSL_CERT') if [ ! -z "$cert" ]; then @@ -85,7 +85,7 @@ if [ ! -z "$stats_type" ] && [ "$stats_type" != 'no' ]; then fi # Deleting directory -rm -rf $V_HOME/$user/domains/$domain +rm -rf $V_HOME/$user/web/$domain # Deleting logs rm -rf /var/log/httpd/domains/$domain.log* diff --git a/bin/v_del_web_domain_cgi b/bin/v_del_web_domain_cgi index 80337fe85..43e00d513 100755 --- a/bin/v_del_web_domain_cgi +++ b/bin/v_del_web_domain_cgi @@ -56,7 +56,7 @@ tpl_file="$V_WEBTPL/apache_$tpl_name.tpl" # Defining params for ScriptAlias conf="$V_HOME/$user/conf/httpd.conf" search_phrase='ScriptAlias ' -str_repl=" #ScriptAlias /cgi-bin/ $V_HOME/$user/domains/$domain/cgi-bin" +str_repl=" #ScriptAlias /cgi-bin/ $V_HOME/$user/web/$domain/cgi-bin" change_web_config # Defining params for Options @@ -72,7 +72,7 @@ if [ ! -z "$cert" ]; then tpl_file="$V_WEBTPL/apache_$tpl_name.stpl" conf="$V_HOME/$user/conf/shttpd.conf" search_phrase='ScriptAlias ' - str_repl=" #ScriptAlias /cgi-bin/ $V_HOME/$user/domains/$domain/cgi-bin" + str_repl=" #ScriptAlias /cgi-bin/ $V_HOME/$user/web/$domain/cgi-bin" change_web_config # Defining params for Options diff --git a/bin/v_del_web_domain_stat b/bin/v_del_web_domain_stat index 78f0fe180..8de21ca1c 100755 --- a/bin/v_del_web_domain_stat +++ b/bin/v_del_web_domain_stat @@ -52,7 +52,7 @@ is_web_domain_value_exist '$STATS' type=$(get_web_domain_value '$STATS') # Defining statistic dir -stat_dir="$V_HOME/$user/domains/$domain/stats" +stat_dir="$V_HOME/$user/web/$domain/stats" # Deleting dir content rm -rf $stat_dir/* diff --git a/bin/v_del_web_domain_stat_auth b/bin/v_del_web_domain_stat_auth index ccc7d8279..098f45af8 100755 --- a/bin/v_del_web_domain_stat_auth +++ b/bin/v_del_web_domain_stat_auth @@ -50,7 +50,7 @@ is_web_domain_value_exist '$STATS_AUTH' #----------------------------------------------------------# # Definining statistic dir -stat_dir="$V_HOME/$user/domains/$domain/stats" +stat_dir="$V_HOME/$user/web/$domain/stats" # Checking auth_user if [ ! -z "$auth_user" ]; then diff --git a/bin/v_rebuild_web_domains b/bin/v_rebuild_web_domains index c23bc7db1..4dc1d3c31 100755 --- a/bin/v_rebuild_web_domains +++ b/bin/v_rebuild_web_domains @@ -62,7 +62,7 @@ for domain in $domains; do domain=$(get_web_domain_value '$DOMAIN') domain_idn=$(idn -t --quiet -a "$domain") group="$user" - docroot="$V_HOME/$user/domains/$domain/public_html" + docroot="$V_HOME/$user/web/$domain/public_html" email="$user@$domain" aliases=$(get_web_domain_value '$ALIAS') aliases_idn=$(idn -t --quiet -a "$aliases") @@ -90,7 +90,7 @@ for domain in $domains; do # Defining params for ScriptAlias search_phrase='ScriptAlias ' str_repl=" #ScriptAlias /cgi-bin/" - str_repl="$str_repl $V_HOME/$user/domains/$domain/cgi-bin/" + str_repl="$str_repl $V_HOME/$user/web/$domain/cgi-bin/" change_web_config # Defining params for Options @@ -107,8 +107,8 @@ for domain in $domains; do ssl_key="$V_HOME/$user/conf/$cert.key" tpl_option=$(get_web_domain_value '$SSL_HOME') case $tpl_option in - single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; - same) docroot="$V_HOME/$user/domains/$domain/public_html" ;; + single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;; + same) docroot="$V_HOME/$user/web/$domain/public_html" ;; *) check_args '3' "$#" 'user domain certificate [sslhome]' esac web_ssl_port=$(get_config_value '$WEB_SSL_PORT') @@ -128,7 +128,7 @@ for domain in $domains; do # Defining params for ScriptAlias search_phrase='ScriptAlias ' str_repl=" #ScriptAlias /cgi-bin/" - str_repl="$str_repl $V_HOME/$user/domains/$domain/cgi-bin/" + str_repl="$str_repl $V_HOME/$user/web/$domain/cgi-bin/" change_web_config # Defining params for Options diff --git a/bin/v_unsuspend_web_domain b/bin/v_unsuspend_web_domain index a820ee28b..208176460 100755 --- a/bin/v_unsuspend_web_domain +++ b/bin/v_unsuspend_web_domain @@ -54,7 +54,7 @@ conf="$V_HOME/$user/conf/httpd.conf" search_phrase='Redirect / ' # Defining replace string -str_repl=" DocumentRoot $V_HOME/$user/domains/$domain/public_html" +str_repl=" DocumentRoot $V_HOME/$user/web/$domain/public_html" # Unsuspending vhost change_web_config @@ -71,8 +71,8 @@ if [ ! -z "$cert" ]; then # Switching on option case $tpl_option in - single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; - *) docroot="$V_HOME/$user/domains/$domain/public_html" ;; + single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;; + *) docroot="$V_HOME/$user/web/$domain/public_html" ;; esac # Defining replace string diff --git a/bin/v_unsuspend_web_domains b/bin/v_unsuspend_web_domains index ac9d06685..c4bf07fe0 100755 --- a/bin/v_unsuspend_web_domains +++ b/bin/v_unsuspend_web_domains @@ -61,7 +61,7 @@ for domain in $domains; do search_phrase='Redirect / ' # Defining replace string - str_repl=" DocumentRoot $V_HOME/$user/domains/$domain/public_html" + str_repl=" DocumentRoot $V_HOME/$user/web/$domain/public_html" # Unsuspending vhost change_web_config @@ -78,8 +78,8 @@ for domain in $domains; do # Switching on option case $tpl_opt in - single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; - *) docroot="$V_HOME/$user/domains/$domain/public_html" ;; + single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;; + *) docroot="$V_HOME/$user/web/$domain/public_html" ;; esac # Defining replace string diff --git a/bin/v_upd_web_domain_disk b/bin/v_upd_web_domain_disk index 7d8b43eb0..3278bb4a5 100755 --- a/bin/v_upd_web_domain_disk +++ b/bin/v_upd_web_domain_disk @@ -44,7 +44,7 @@ is_domain_suspended 'web_domains' #----------------------------------------------------------# # Defining home directory -home_dir="$V_HOME/$user/domains/$domain/" +home_dir="$V_HOME/$user/web/$domain/" # Checking home directory exist if [ -e "$home_dir" ]; then diff --git a/bin/v_upd_web_domains_disk b/bin/v_upd_web_domains_disk index 31d51358c..14941a759 100755 --- a/bin/v_upd_web_domains_disk +++ b/bin/v_upd_web_domains_disk @@ -51,7 +51,7 @@ domains=$(dom_clear_search) for domain in $domains; do # Defining home directory - home_dir="$V_HOME/$user/domains/$domain/" + home_dir="$V_HOME/$user/web/$domain/" # Checking home directory exist if [ -e "$home_dir" ]; then diff --git a/data/templates/apache_default.stpl b/data/templates/apache_default.stpl index e8ec79f07..39b8e59af 100644 --- a/data/templates/apache_default.stpl +++ b/data/templates/apache_default.stpl @@ -4,9 +4,9 @@ ServerAlias %alias_idn% ServerAdmin %email% DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/domains/%domain%/stats/ - Alias /error/ %home%/%user%/domains/%domain%/document_errors/ + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ SuexecUserGroup %user% %group% CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.log combined @@ -25,10 +25,10 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - + AllowOverride All - php_admin_value open_basedir %home%/%user%/domains:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp SSLEngine on SSLVerifyClient none SSLCertificateFile %ssl_cert% diff --git a/data/templates/apache_default.tpl b/data/templates/apache_default.tpl index 437b94d98..6274f8853 100644 --- a/data/templates/apache_default.tpl +++ b/data/templates/apache_default.tpl @@ -4,9 +4,9 @@ ServerAlias %alias_idn% ServerAdmin %email% DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/domains/%domain%/stats/ - Alias /error/ %home%/%user%/domains/%domain%/document_errors/ + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ SuexecUserGroup %user% %group% CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.log combined @@ -24,10 +24,10 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - + AllowOverride All - php_admin_value open_basedir %home%/%user%/domains:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp Include %home%/%user%/conf/%domain%.httpd.* diff --git a/data/templates/apache_phpcgi.sh b/data/templates/apache_phpcgi.sh index 006cc7cde..6565e103d 100755 --- a/data/templates/apache_phpcgi.sh +++ b/data/templates/apache_phpcgi.sh @@ -7,7 +7,7 @@ home_dir="$4" docroot="$5" wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' -wrapper_file="$home_dir/$user/domains/$domain/cgi-bin/php" +wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" echo "$wrapper_script" > $wrapper_file chown $user:$user $wrapper_file diff --git a/data/templates/apache_phpcgi.stpl b/data/templates/apache_phpcgi.stpl index e8ec79f07..39b8e59af 100644 --- a/data/templates/apache_phpcgi.stpl +++ b/data/templates/apache_phpcgi.stpl @@ -4,9 +4,9 @@ ServerAlias %alias_idn% ServerAdmin %email% DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/domains/%domain%/stats/ - Alias /error/ %home%/%user%/domains/%domain%/document_errors/ + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ SuexecUserGroup %user% %group% CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.log combined @@ -25,10 +25,10 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - + AllowOverride All - php_admin_value open_basedir %home%/%user%/domains:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp + php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp SSLEngine on SSLVerifyClient none SSLCertificateFile %ssl_cert% diff --git a/data/templates/apache_phpcgi.tpl b/data/templates/apache_phpcgi.tpl index 332deda54..93f62c04b 100644 --- a/data/templates/apache_phpcgi.tpl +++ b/data/templates/apache_phpcgi.tpl @@ -4,9 +4,9 @@ ServerAlias %alias_idn% ServerAdmin %email% DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/domains/%domain%/stats/ - Alias /error/ %home%/%user%/domains/%domain%/document_errors/ + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ SuexecUserGroup %user% %group% CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.log combined @@ -21,7 +21,7 @@ AddHandler phpcgi-script .php - + AllowOverride All Include %home%/%user%/conf/%domain%.httpd.* diff --git a/data/templates/apache_unlim.stpl b/data/templates/apache_unlim.stpl index e83c1ea4f..f1266447a 100644 --- a/data/templates/apache_unlim.stpl +++ b/data/templates/apache_unlim.stpl @@ -4,9 +4,9 @@ ServerAlias %alias_idn% ServerAdmin %email% DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/domains/%domain%/stats/ - Alias /error/ %home%/%user%/domains/%domain%/document_errors/ + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ SuexecUserGroup %user% %group% CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.log combined @@ -25,7 +25,7 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - + AllowOverride All php_admin_value open_basedir none diff --git a/data/templates/apache_unlim.tpl b/data/templates/apache_unlim.tpl index 5942d7bd5..8609f776a 100644 --- a/data/templates/apache_unlim.tpl +++ b/data/templates/apache_unlim.tpl @@ -4,9 +4,9 @@ ServerAlias %alias_idn% ServerAdmin %email% DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/domains/%domain%/stats/ - Alias /error/ %home%/%user%/domains/%domain%/document_errors/ + ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ + Alias /vstats/ %home%/%user%/web/%domain%/stats/ + Alias /error/ %home%/%user%/web/%domain%/document_errors/ SuexecUserGroup %user% %group% CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.log combined @@ -24,7 +24,7 @@ php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' - + AllowOverride All php_admin_value open_basedir none diff --git a/data/templates/awstats.tpl b/data/templates/awstats.tpl index 6152863ae..3b1a017a9 100644 --- a/data/templates/awstats.tpl +++ b/data/templates/awstats.tpl @@ -5,7 +5,7 @@ LogSeparator=" " SiteDomain="%domain%" HostAliases="%alias%" DNSLookup="2" -DirData="%home%/%user%/domains/%domain%/stats/" +DirData="%home%/%user%/web/%domain%/stats/" DirCgi="/awstats" DirIcons="/awstatsicons" AllowToUpdateStatsFromBrowser="0" diff --git a/data/templates/ngingx_vhost_default.stpl b/data/templates/ngingx_vhost_default.stpl index 5b0b6d600..cbf2959f8 100644 --- a/data/templates/ngingx_vhost_default.stpl +++ b/data/templates/ngingx_vhost_default.stpl @@ -20,7 +20,7 @@ server { } location /error/ { - alias %home%/%user%/domains/%domain%/document_errors/; + alias %home%/%user%/web/%domain%/document_errors/; } location @fallback { diff --git a/data/templates/ngingx_vhost_default.tpl b/data/templates/ngingx_vhost_default.tpl index 66f32c6bf..cda9f9f25 100644 --- a/data/templates/ngingx_vhost_default.tpl +++ b/data/templates/ngingx_vhost_default.tpl @@ -17,7 +17,7 @@ server { } location /error/ { - alias %home%/%user%/domains/%domain%/document_errors/; + alias %home%/%user%/web/%domain%/document_errors/; } location @fallback { diff --git a/data/templates/webalizer.tpl b/data/templates/webalizer.tpl index 6442ce08c..8da98426d 100644 --- a/data/templates/webalizer.tpl +++ b/data/templates/webalizer.tpl @@ -1,7 +1,7 @@ HostName %domain_idn% LogFile /var/log/httpd/domains/%domain%.log -OutputDir %home%/%user%/domains/%domain%/stats -HistoryName %home%/%user%/domains/%domain%/stats/%domain%.hist +OutputDir %home%/%user%/web/%domain%/stats +HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist Incremental yes IncrementalName %home%/%user%/domains/%domain%/stats/%domain%.current PageType htm*