github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-20 21:34:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

web directiry change

Browse source
This commit is contained in:
Serghey Rodin 2011-07-29 10:23:34 +03:00
commit 5b7693ee23
28 changed files with 97 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bin/v_add_sys_user
View file

@ -82,12 +82,12 @@ fi
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
mkdir $V_HOME/$user/conf mkdir $V_HOME/$user/conf
mkdir $V_HOME/$user/domains mkdir $V_HOME/$user/web
mkdir $V_HOME/$user/tmp mkdir $V_HOME/$user/tmp
chmod 751 $V_HOME/$user/conf chmod 751 $V_HOME/$user/conf
chmod 751 $V_HOME/$user/domains chmod 751 $V_HOME/$user/web
chmod 777 $V_HOME/$user/tmp chmod 777 $V_HOME/$user/tmp
chown $user:$user $V_HOME/$user/domains chown $user:$user $V_HOME/$user/web
fi fi
if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then

54
bin/v_add_web_domain
View file

@ -84,7 +84,7 @@ fi
web_port=$(get_config_value '$WEB_PORT') web_port=$(get_config_value '$WEB_PORT')
group="$user" group="$user"
email="$user@$domain" 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" conf="$V_HOME/$user/conf/httpd.conf"
tpl_file="$V_WEBTPL/apache_$template.tpl" tpl_file="$V_WEBTPL/apache_$template.tpl"
@ -105,14 +105,14 @@ fi
add_web_config add_web_config
# Building directory tree # Building directory tree
mkdir $V_HOME/$user/domains/$domain \ mkdir $V_HOME/$user/web/$domain \
$V_HOME/$user/domains/$domain/public_html \ $V_HOME/$user/web/$domain/public_html \
$V_HOME/$user/domains/$domain/public_shtml \ $V_HOME/$user/web/$domain/public_shtml \
$V_HOME/$user/domains/$domain/document_errors \ $V_HOME/$user/web/$domain/document_errors \
$V_HOME/$user/domains/$domain/cgi-bin \ $V_HOME/$user/web/$domain/cgi-bin \
$V_HOME/$user/domains/$domain/private \ $V_HOME/$user/web/$domain/private \
$V_HOME/$user/domains/$domain/stats \ $V_HOME/$user/web/$domain/stats \
$V_HOME/$user/domains/$domain/logs $V_HOME/$user/web/$domain/logs
# Adding domain logs # Adding domain logs
touch /var/log/httpd/domains/$domain.bytes \ 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 /var/log/httpd/domains/$domain.error.log
# Adding symlink for logs # 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 # Adding domain skeleton
cp -r $V_WEBTPL/skel/public_html/ $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/domains/$domain/ cp -r $V_WEBTPL/skel/public_shtml/ $V_HOME/$user/web/$domain/
cp -r $V_WEBTPL/skel/document_errors/ $V_HOME/$user/domains/$domain/ cp -r $V_WEBTPL/skel/document_errors/ $V_HOME/$user/web/$domain/
cp -r $V_WEBTPL/skel/cgi-bin/ $V_HOME/$user/domains/$domain/ cp -r $V_WEBTPL/skel/cgi-bin/ $V_HOME/$user/web/$domain/
# Changing tpl values # 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 sed -i "s/%domain%/$domain/g" $file
done done
# Changing file owner # 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.* chown root:$user /var/log/httpd/domains/$domain.*
# Changing file permissions # Changing file permissions
chmod 551 $V_HOME/$user/domains/$domain chmod 551 $V_HOME/$user/web/$domain
chmod 751 $V_HOME/$user/domains/$domain/private chmod 751 $V_HOME/$user/web/$domain/private
chmod 751 $V_HOME/$user/domains/$domain/cgi-bin chmod 751 $V_HOME/$user/web/$domain/cgi-bin
chmod 751 $V_HOME/$user/domains/$domain/public_html chmod 751 $V_HOME/$user/web/$domain/public_html
chmod 751 $V_HOME/$user/domains/$domain/public_shtml chmod 751 $V_HOME/$user/web/$domain/public_shtml
chmod 751 $V_HOME/$user/domains/$domain/document_errors chmod 751 $V_HOME/$user/web/$domain/document_errors
chmod -f -R 775 $V_HOME/$user/domains/$domain/cgi-bin/* chmod -f -R 775 $V_HOME/$user/web/$domain/cgi-bin/*
chmod -f -R 775 $V_HOME/$user/domains/$domain/public_html/* chmod -f -R 775 $V_HOME/$user/web/$domain/public_html/*
chmod -f -R 775 $V_HOME/$user/domains/$domain/document_errors/* chmod -f -R 775 $V_HOME/$user/web/$domain/document_errors/*
chmod 551 $V_HOME/$user/domains/$domain/stats chmod 551 $V_HOME/$user/web/$domain/stats
chmod 551 $V_HOME/$user/domains/$domain/logs chmod 551 $V_HOME/$user/web/$domain/logs
chmod 640 /var/log/httpd/domains/$domain.* chmod 640 /var/log/httpd/domains/$domain.*
# Running template trigger # Running template trigger

4
bin/v_add_web_domain_cgi
View file

@ -56,7 +56,7 @@ tpl_file="$V_WEBTPL/apache_$tpl_name.tpl"
# Defining params for ScriptAlias # Defining params for ScriptAlias
conf="$V_HOME/$user/conf/httpd.conf" conf="$V_HOME/$user/conf/httpd.conf"
search_phrase='ScriptAlias ' 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 change_web_config
# Defining params for Options # Defining params for Options
@ -72,7 +72,7 @@ if [ ! -z "$cert" ]; then
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl" tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"
conf="$V_HOME/$user/conf/shttpd.conf" conf="$V_HOME/$user/conf/shttpd.conf"
search_phrase='ScriptAlias ' 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 change_web_config
# Defining params for Options # Defining params for Options

6
bin/v_add_web_domain_nginx
View file

@ -62,7 +62,7 @@ web_port=$(get_config_value '$WEB_PORT')
proxy_port=$(get_config_value '$PROXY_PORT') proxy_port=$(get_config_value '$PROXY_PORT')
domain_idn=$(idn -t --quiet -a "$domain") domain_idn=$(idn -t --quiet -a "$domain")
group="$user" group="$user"
docroot="$V_HOME/$user/domains/$domain/public_html" docroot="$V_HOME/$user/web/$domain/public_html"
email="$user@$domain" email="$user@$domain"
aliases=$(get_web_domain_value '$ALIAS') aliases=$(get_web_domain_value '$ALIAS')
aliases_idn=$(idn -t --quiet -a "$aliases") aliases_idn=$(idn -t --quiet -a "$aliases")
@ -95,8 +95,8 @@ if [ ! -z "$cert" ]; then
ssl_key="$V_HOME/$user/conf/$cert.key" ssl_key="$V_HOME/$user/conf/$cert.key"
tpl_option=$(get_web_domain_value '$SSL_HOME') tpl_option=$(get_web_domain_value '$SSL_HOME')
case $tpl_option in case $tpl_option in
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;; same) docroot="$V_HOME/$user/web/$domain/public_html" ;;
*) check_args '3' "$#" 'user domain certificate [sslhome]' *) check_args '3' "$#" 'user domain certificate [sslhome]'
esac esac
web_ssl_port=$(get_config_value '$WEB_SSL_PORT') web_ssl_port=$(get_config_value '$WEB_SSL_PORT')

4
bin/v_add_web_domain_ssl
View file

@ -75,8 +75,8 @@ email="$user@$domain"
ssl_cert="$V_HOME/$user/conf/$cert.crt" ssl_cert="$V_HOME/$user/conf/$cert.crt"
ssl_key="$V_HOME/$user/conf/$cert.key" ssl_key="$V_HOME/$user/conf/$cert.key"
case $tpl_option in case $tpl_option in
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;; same) docroot="$V_HOME/$user/web/$domain/public_html" ;;
*) check_args '3' "$#" 'user domain certificate [sslhome]' *) check_args '3' "$#" 'user domain certificate [sslhome]'
esac esac
group="$user" group="$user"

2
bin/v_add_web_domain_stat_auth
View file

@ -48,7 +48,7 @@ is_domain_suspended 'web_domains'
#----------------------------------------------------------# #----------------------------------------------------------#
# Definining statistic dir # Definining statistic dir
stat_dir="$V_HOME/$user/domains/$domain/stats" stat_dir="$V_HOME/$user/web/$domain/stats"
# Adding htaccess file # Adding htaccess file
if [ ! -e "$stat_dir/.htaccess" ]; then if [ ! -e "$stat_dir/.htaccess" ]; then

8
bin/v_change_web_domain_sslhome
View file

@ -62,8 +62,8 @@ search_phrase='DocumentRoot'
# Parsing tpl_option # Parsing tpl_option
case $tpl_option in case $tpl_option in
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;; same) docroot="$V_HOME/$user/web/$domain/public_html" ;;
*) check_args '3' "2" 'user domain sslhome' *) check_args '3' "2" 'user domain sslhome'
esac esac
@ -78,8 +78,8 @@ ssl_home=$(get_web_domain_value '$SSL_HOME')
# Parsing old sslhome # Parsing old sslhome
case $ssl_home in case $ssl_home in
single) dirroot="$V_HOME/$user/domains/$domain/public_shtml" ;; single) dirroot="$V_HOME/$user/web/$domain/public_shtml" ;;
same) dirroot="$V_HOME/$user/domains/$domain/public_html" ;; same) dirroot="$V_HOME/$user/web/$domain/public_html" ;;
*) check_args '3' "2" 'user domain sslhome' *) check_args '3' "2" 'user domain sslhome'
esac esac

6
bin/v_change_web_domain_tpl
View file

@ -77,7 +77,7 @@ aliases=$(get_web_domain_value '$ALIAS')
aliases_idn=$(idn -t --quiet -a "$aliases") aliases_idn=$(idn -t --quiet -a "$aliases")
web_port=$(get_config_value '$WEB_PORT') web_port=$(get_config_value '$WEB_PORT')
email="$user@$domain" 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" conf="$V_HOME/$user/conf/httpd.conf"
tpl_file="$V_WEBTPL/apache_$template.tpl" tpl_file="$V_WEBTPL/apache_$template.tpl"
group="$user" group="$user"
@ -111,8 +111,8 @@ if [ ! -z "$cert" ]; then
ssl_cert="$V_HOME/$user/conf/$cert.crt" ssl_cert="$V_HOME/$user/conf/$cert.crt"
ssl_key="$V_HOME/$user/conf/$cert.key" ssl_key="$V_HOME/$user/conf/$cert.key"
case $tpl_option in case $tpl_option in
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
*) docroot="$V_HOME/$user/domains/$domain/public_html" ;; *) docroot="$V_HOME/$user/web/$domain/public_html" ;;
esac esac
conf="$V_HOME/$user/conf/shttpd.conf" conf="$V_HOME/$user/conf/shttpd.conf"
tpl_file="$V_WEBTPL/apache_$template.stpl" tpl_file="$V_WEBTPL/apache_$template.stpl"

4
bin/v_del_web_domain
View file

@ -55,7 +55,7 @@ conf="$V_HOME/$user/conf/httpd.conf"
# Deleting domain # Deleting domain
del_web_config del_web_config
exit
# Checking ssl # Checking ssl
cert=$(get_web_domain_value '$SSL_CERT') cert=$(get_web_domain_value '$SSL_CERT')
if [ ! -z "$cert" ]; then if [ ! -z "$cert" ]; then
@ -85,7 +85,7 @@ if [ ! -z "$stats_type" ] && [ "$stats_type" != 'no' ]; then
fi fi
# Deleting directory # Deleting directory
rm -rf $V_HOME/$user/domains/$domain rm -rf $V_HOME/$user/web/$domain
# Deleting logs # Deleting logs
rm -rf /var/log/httpd/domains/$domain.log* rm -rf /var/log/httpd/domains/$domain.log*

4
bin/v_del_web_domain_cgi
View file

@ -56,7 +56,7 @@ tpl_file="$V_WEBTPL/apache_$tpl_name.tpl"
# Defining params for ScriptAlias # Defining params for ScriptAlias
conf="$V_HOME/$user/conf/httpd.conf" conf="$V_HOME/$user/conf/httpd.conf"
search_phrase='ScriptAlias ' 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 change_web_config
# Defining params for Options # Defining params for Options
@ -72,7 +72,7 @@ if [ ! -z "$cert" ]; then
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl" tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"
conf="$V_HOME/$user/conf/shttpd.conf" conf="$V_HOME/$user/conf/shttpd.conf"
search_phrase='ScriptAlias ' 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 change_web_config
# Defining params for Options # Defining params for Options

2
bin/v_del_web_domain_stat
View file

@ -52,7 +52,7 @@ is_web_domain_value_exist '$STATS'
type=$(get_web_domain_value '$STATS') type=$(get_web_domain_value '$STATS')
# Defining statistic dir # Defining statistic dir
stat_dir="$V_HOME/$user/domains/$domain/stats" stat_dir="$V_HOME/$user/web/$domain/stats"
# Deleting dir content # Deleting dir content
rm -rf $stat_dir/* rm -rf $stat_dir/*

2
bin/v_del_web_domain_stat_auth
View file

@ -50,7 +50,7 @@ is_web_domain_value_exist '$STATS_AUTH'
#----------------------------------------------------------# #----------------------------------------------------------#
# Definining statistic dir # Definining statistic dir
stat_dir="$V_HOME/$user/domains/$domain/stats" stat_dir="$V_HOME/$user/web/$domain/stats"
# Checking auth_user # Checking auth_user
if [ ! -z "$auth_user" ]; then if [ ! -z "$auth_user" ]; then

10
bin/v_rebuild_web_domains
View file

@ -62,7 +62,7 @@ for domain in $domains; do
domain=$(get_web_domain_value '$DOMAIN') domain=$(get_web_domain_value '$DOMAIN')
domain_idn=$(idn -t --quiet -a "$domain") domain_idn=$(idn -t --quiet -a "$domain")
group="$user" group="$user"
docroot="$V_HOME/$user/domains/$domain/public_html" docroot="$V_HOME/$user/web/$domain/public_html"
email="$user@$domain" email="$user@$domain"
aliases=$(get_web_domain_value '$ALIAS') aliases=$(get_web_domain_value '$ALIAS')
aliases_idn=$(idn -t --quiet -a "$aliases") aliases_idn=$(idn -t --quiet -a "$aliases")
@ -90,7 +90,7 @@ for domain in $domains; do
# Defining params for ScriptAlias # Defining params for ScriptAlias
search_phrase='ScriptAlias ' search_phrase='ScriptAlias '
str_repl=" #ScriptAlias /cgi-bin/" 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 change_web_config
# Defining params for Options # Defining params for Options
@ -107,8 +107,8 @@ for domain in $domains; do
ssl_key="$V_HOME/$user/conf/$cert.key" ssl_key="$V_HOME/$user/conf/$cert.key"
tpl_option=$(get_web_domain_value '$SSL_HOME') tpl_option=$(get_web_domain_value '$SSL_HOME')
case $tpl_option in case $tpl_option in
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;; same) docroot="$V_HOME/$user/web/$domain/public_html" ;;
*) check_args '3' "$#" 'user domain certificate [sslhome]' *) check_args '3' "$#" 'user domain certificate [sslhome]'
esac esac
web_ssl_port=$(get_config_value '$WEB_SSL_PORT') web_ssl_port=$(get_config_value '$WEB_SSL_PORT')
@ -128,7 +128,7 @@ for domain in $domains; do
# Defining params for ScriptAlias # Defining params for ScriptAlias
search_phrase='ScriptAlias ' search_phrase='ScriptAlias '
str_repl=" #ScriptAlias /cgi-bin/" 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 change_web_config
# Defining params for Options # Defining params for Options

6
bin/v_unsuspend_web_domain
View file

@ -54,7 +54,7 @@ conf="$V_HOME/$user/conf/httpd.conf"
search_phrase='Redirect / ' search_phrase='Redirect / '
# Defining replace string # 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 # Unsuspending vhost
change_web_config change_web_config
@ -71,8 +71,8 @@ if [ ! -z "$cert" ]; then
# Switching on option # Switching on option
case $tpl_option in case $tpl_option in
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
*) docroot="$V_HOME/$user/domains/$domain/public_html" ;; *) docroot="$V_HOME/$user/web/$domain/public_html" ;;
esac esac
# Defining replace string # Defining replace string

6
bin/v_unsuspend_web_domains
View file

@ -61,7 +61,7 @@ for domain in $domains; do
search_phrase='Redirect / ' search_phrase='Redirect / '
# Defining replace string # 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 # Unsuspending vhost
change_web_config change_web_config
@ -78,8 +78,8 @@ for domain in $domains; do
# Switching on option # Switching on option
case $tpl_opt in case $tpl_opt in
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;; single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
*) docroot="$V_HOME/$user/domains/$domain/public_html" ;; *) docroot="$V_HOME/$user/web/$domain/public_html" ;;
esac esac
# Defining replace string # Defining replace string

2
bin/v_upd_web_domain_disk
View file

@ -44,7 +44,7 @@ is_domain_suspended 'web_domains'
#----------------------------------------------------------# #----------------------------------------------------------#
# Defining home directory # Defining home directory
home_dir="$V_HOME/$user/domains/$domain/" home_dir="$V_HOME/$user/web/$domain/"
# Checking home directory exist # Checking home directory exist
if [ -e "$home_dir" ]; then if [ -e "$home_dir" ]; then

2
bin/v_upd_web_domains_disk
View file

@ -51,7 +51,7 @@ domains=$(dom_clear_search)
for domain in $domains; do for domain in $domains; do
# Defining home directory # Defining home directory
home_dir="$V_HOME/$user/domains/$domain/" home_dir="$V_HOME/$user/web/$domain/"
# Checking home directory exist # Checking home directory exist
if [ -e "$home_dir" ]; then if [ -e "$home_dir" ]; then

10
data/templates/apache_default.stpl
View file

@ -4,9 +4,9 @@
ServerAlias %alias_idn% ServerAlias %alias_idn%
ServerAdmin %email% ServerAdmin %email%
DocumentRoot %docroot% DocumentRoot %docroot%
ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
Alias /vstats/ %home%/%user%/domains/%domain%/stats/ Alias /vstats/ %home%/%user%/web/%domain%/stats/
Alias /error/ %home%/%user%/domains/%domain%/document_errors/ Alias /error/ %home%/%user%/web/%domain%/document_errors/
SuexecUserGroup %user% %group% SuexecUserGroup %user% %group%
CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
@ -25,10 +25,10 @@
php_admin_value session.save_path %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp
php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
</Directory> </Directory>
<Directory %home%/%user%/domains/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
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 SSLEngine on
SSLVerifyClient none SSLVerifyClient none
SSLCertificateFile %ssl_cert% SSLCertificateFile %ssl_cert%

10
data/templates/apache_default.tpl
View file

@ -4,9 +4,9 @@
ServerAlias %alias_idn% ServerAlias %alias_idn%
ServerAdmin %email% ServerAdmin %email%
DocumentRoot %docroot% DocumentRoot %docroot%
ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
Alias /vstats/ %home%/%user%/domains/%domain%/stats/ Alias /vstats/ %home%/%user%/web/%domain%/stats/
Alias /error/ %home%/%user%/domains/%domain%/document_errors/ Alias /error/ %home%/%user%/web/%domain%/document_errors/
SuexecUserGroup %user% %group% SuexecUserGroup %user% %group%
CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
@ -24,10 +24,10 @@
php_admin_value session.save_path %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp
php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
</Directory> </Directory>
<Directory %home%/%user%/domains/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
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.* Include %home%/%user%/conf/%domain%.httpd.*
</VirtualHost> </VirtualHost>

2
data/templates/apache_phpcgi.sh
View file

@ -7,7 +7,7 @@ home_dir="$4"
docroot="$5" docroot="$5"
wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' 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 echo "$wrapper_script" > $wrapper_file
chown $user:$user $wrapper_file chown $user:$user $wrapper_file

10
data/templates/apache_phpcgi.stpl
View file

@ -4,9 +4,9 @@
ServerAlias %alias_idn% ServerAlias %alias_idn%
ServerAdmin %email% ServerAdmin %email%
DocumentRoot %docroot% DocumentRoot %docroot%
ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
Alias /vstats/ %home%/%user%/domains/%domain%/stats/ Alias /vstats/ %home%/%user%/web/%domain%/stats/
Alias /error/ %home%/%user%/domains/%domain%/document_errors/ Alias /error/ %home%/%user%/web/%domain%/document_errors/
SuexecUserGroup %user% %group% SuexecUserGroup %user% %group%
CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
@ -25,10 +25,10 @@
php_admin_value session.save_path %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp
php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
</Directory> </Directory>
<Directory %home%/%user%/domains/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
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 SSLEngine on
SSLVerifyClient none SSLVerifyClient none
SSLCertificateFile %ssl_cert% SSLCertificateFile %ssl_cert%

8
data/templates/apache_phpcgi.tpl
View file

@ -4,9 +4,9 @@
ServerAlias %alias_idn% ServerAlias %alias_idn%
ServerAdmin %email% ServerAdmin %email%
DocumentRoot %docroot% DocumentRoot %docroot%
ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
Alias /vstats/ %home%/%user%/domains/%domain%/stats/ Alias /vstats/ %home%/%user%/web/%domain%/stats/
Alias /error/ %home%/%user%/domains/%domain%/document_errors/ Alias /error/ %home%/%user%/web/%domain%/document_errors/
SuexecUserGroup %user% %group% SuexecUserGroup %user% %group%
CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
@ -21,7 +21,7 @@
AddHandler phpcgi-script .php AddHandler phpcgi-script .php
</Directory> </Directory>
<Directory %home%/%user%/domains/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
Include %home%/%user%/conf/%domain%.httpd.* Include %home%/%user%/conf/%domain%.httpd.*

8
data/templates/apache_unlim.stpl
View file

@ -4,9 +4,9 @@
ServerAlias %alias_idn% ServerAlias %alias_idn%
ServerAdmin %email% ServerAdmin %email%
DocumentRoot %docroot% DocumentRoot %docroot%
ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
Alias /vstats/ %home%/%user%/domains/%domain%/stats/ Alias /vstats/ %home%/%user%/web/%domain%/stats/
Alias /error/ %home%/%user%/domains/%domain%/document_errors/ Alias /error/ %home%/%user%/web/%domain%/document_errors/
SuexecUserGroup %user% %group% SuexecUserGroup %user% %group%
CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
@ -25,7 +25,7 @@
php_admin_value session.save_path %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp
php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
</Directory> </Directory>
<Directory %home%/%user%/domains/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
php_admin_value open_basedir none php_admin_value open_basedir none

8
data/templates/apache_unlim.tpl
View file

@ -4,9 +4,9 @@
ServerAlias %alias_idn% ServerAlias %alias_idn%
ServerAdmin %email% ServerAdmin %email%
DocumentRoot %docroot% DocumentRoot %docroot%
ScriptAlias /cgi-bin/ %home%/%user%/domains/%domain%/cgi-bin/ ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
Alias /vstats/ %home%/%user%/domains/%domain%/stats/ Alias /vstats/ %home%/%user%/web/%domain%/stats/
Alias /error/ %home%/%user%/domains/%domain%/document_errors/ Alias /error/ %home%/%user%/web/%domain%/document_errors/
SuexecUserGroup %user% %group% SuexecUserGroup %user% %group%
CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
@ -24,7 +24,7 @@
php_admin_value session.save_path %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp
php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%' php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
</Directory> </Directory>
<Directory %home%/%user%/domains/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
php_admin_value open_basedir none php_admin_value open_basedir none

2
data/templates/awstats.tpl
View file

@ -5,7 +5,7 @@ LogSeparator=" "
SiteDomain="%domain%" SiteDomain="%domain%"
HostAliases="%alias%" HostAliases="%alias%"
DNSLookup="2" DNSLookup="2"
DirData="%home%/%user%/domains/%domain%/stats/" DirData="%home%/%user%/web/%domain%/stats/"
DirCgi="/awstats" DirCgi="/awstats"
DirIcons="/awstatsicons" DirIcons="/awstatsicons"
AllowToUpdateStatsFromBrowser="0" AllowToUpdateStatsFromBrowser="0"

2
data/templates/ngingx_vhost_default.stpl
View file

@ -20,7 +20,7 @@ server {
} }
location /error/ { location /error/ {
alias %home%/%user%/domains/%domain%/document_errors/; alias %home%/%user%/web/%domain%/document_errors/;
} }
location @fallback { location @fallback {

2
data/templates/ngingx_vhost_default.tpl
View file

@ -17,7 +17,7 @@ server {
} }
location /error/ { location /error/ {
alias %home%/%user%/domains/%domain%/document_errors/; alias %home%/%user%/web/%domain%/document_errors/;
} }
location @fallback { location @fallback {

4
data/templates/webalizer.tpl
View file

@ -1,7 +1,7 @@
HostName %domain_idn% HostName %domain_idn%
LogFile /var/log/httpd/domains/%domain%.log LogFile /var/log/httpd/domains/%domain%.log
OutputDir %home%/%user%/domains/%domain%/stats OutputDir %home%/%user%/web/%domain%/stats
HistoryName %home%/%user%/domains/%domain%/stats/%domain%.hist HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist
Incremental yes Incremental yes
IncrementalName %home%/%user%/domains/%domain%/stats/%domain%.current IncrementalName %home%/%user%/domains/%domain%/stats/%domain%.current
PageType htm* PageType htm*