Skip to content

Commit 82fcd3c

Browse files
very-twivery-twi
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents 4df3488 + 081208b commit 82fcd3c

29 files changed

+99
-97
lines changed

‎bin/v_add_sys_user‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ fi
8282

8383
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
8484
mkdir $V_HOME/$user/conf
85-
mkdir $V_HOME/$user/domains
85+
mkdir $V_HOME/$user/web
8686
mkdir $V_HOME/$user/tmp
8787
chmod 751 $V_HOME/$user/conf
88-
chmod 751 $V_HOME/$user/domains
88+
chmod 751 $V_HOME/$user/web
8989
chmod 777 $V_HOME/$user/tmp
90-
chown $user:$user $V_HOME/$user/domains
90+
chown $user:$user $V_HOME/$user/web
9191
fi
9292

9393
if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then

‎bin/v_add_web_domain‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fi
8484
web_port=$(get_config_value '$WEB_PORT')
8585
group="$user"
8686
email="$user@$domain"
87-
docroot="$V_HOME/$user/domains/$domain/public_html"
87+
docroot="$V_HOME/$user/web/$domain/public_html"
8888
conf="$V_HOME/$user/conf/httpd.conf"
8989
tpl_file="$V_WEBTPL/apache_$template.tpl"
9090

@@ -105,50 +105,50 @@ fi
105105
add_web_config
106106

107107
# Building directory tree
108-
mkdir $V_HOME/$user/domains/$domain \
109-
$V_HOME/$user/domains/$domain/public_html \
110-
$V_HOME/$user/domains/$domain/public_shtml \
111-
$V_HOME/$user/domains/$domain/document_errors \
112-
$V_HOME/$user/domains/$domain/cgi-bin \
113-
$V_HOME/$user/domains/$domain/private \
114-
$V_HOME/$user/domains/$domain/stats \
115-
$V_HOME/$user/domains/$domain/logs
108+
mkdir $V_HOME/$user/web/$domain \
109+
$V_HOME/$user/web/$domain/public_html \
110+
$V_HOME/$user/web/$domain/public_shtml \
111+
$V_HOME/$user/web/$domain/document_errors \
112+
$V_HOME/$user/web/$domain/cgi-bin \
113+
$V_HOME/$user/web/$domain/private \
114+
$V_HOME/$user/web/$domain/stats \
115+
$V_HOME/$user/web/$domain/logs
116116

117117
# Adding domain logs
118118
touch /var/log/httpd/domains/$domain.bytes \
119119
/var/log/httpd/domains/$domain.log \
120120
/var/log/httpd/domains/$domain.error.log
121121

122122
# Adding symlink for logs
123-
ln -s /var/log/httpd/domains/$domain.*log $V_HOME/$user/domains/$domain/logs/
123+
ln -s /var/log/httpd/domains/$domain.*log $V_HOME/$user/web/$domain/logs/
124124

125125
# Adding domain skeleton
126-
cp -r $V_WEBTPL/skel/public_html/ $V_HOME/$user/domains/$domain/
127-
cp -r $V_WEBTPL/skel/public_shtml/ $V_HOME/$user/domains/$domain/
128-
cp -r $V_WEBTPL/skel/document_errors/ $V_HOME/$user/domains/$domain/
129-
cp -r $V_WEBTPL/skel/cgi-bin/ $V_HOME/$user/domains/$domain/
126+
cp -r $V_WEBTPL/skel/public_html/ $V_HOME/$user/web/$domain/
127+
cp -r $V_WEBTPL/skel/public_shtml/ $V_HOME/$user/web/$domain/
128+
cp -r $V_WEBTPL/skel/document_errors/ $V_HOME/$user/web/$domain/
129+
cp -r $V_WEBTPL/skel/cgi-bin/ $V_HOME/$user/web/$domain/
130130

131131
# Changing tpl values
132-
for file in $(find "$V_HOME/$user/domains/$domain/" -type f); do
132+
for file in $(find "$V_HOME/$user/web/$domain/" -type f); do
133133
sed -i "s/%domain%/$domain/g" $file
134134
done
135135

136136
# Changing file owner
137-
chown -R $user:$user $V_HOME/$user/domains/$domain
137+
chown -R $user:$user $V_HOME/$user/web/$domain
138138
chown root:$user /var/log/httpd/domains/$domain.*
139139

140140
# Changing file permissions
141-
chmod 551 $V_HOME/$user/domains/$domain
142-
chmod 751 $V_HOME/$user/domains/$domain/private
143-
chmod 751 $V_HOME/$user/domains/$domain/cgi-bin
144-
chmod 751 $V_HOME/$user/domains/$domain/public_html
145-
chmod 751 $V_HOME/$user/domains/$domain/public_shtml
146-
chmod 751 $V_HOME/$user/domains/$domain/document_errors
147-
chmod -f -R 775 $V_HOME/$user/domains/$domain/cgi-bin/*
148-
chmod -f -R 775 $V_HOME/$user/domains/$domain/public_html/*
149-
chmod -f -R 775 $V_HOME/$user/domains/$domain/document_errors/*
150-
chmod 551 $V_HOME/$user/domains/$domain/stats
151-
chmod 551 $V_HOME/$user/domains/$domain/logs
141+
chmod 551 $V_HOME/$user/web/$domain
142+
chmod 751 $V_HOME/$user/web/$domain/private
143+
chmod 751 $V_HOME/$user/web/$domain/cgi-bin
144+
chmod 751 $V_HOME/$user/web/$domain/public_html
145+
chmod 751 $V_HOME/$user/web/$domain/public_shtml
146+
chmod 751 $V_HOME/$user/web/$domain/document_errors
147+
chmod -f -R 775 $V_HOME/$user/web/$domain/cgi-bin/*
148+
chmod -f -R 775 $V_HOME/$user/web/$domain/public_html/*
149+
chmod -f -R 775 $V_HOME/$user/web/$domain/document_errors/*
150+
chmod 551 $V_HOME/$user/web/$domain/stats
151+
chmod 551 $V_HOME/$user/web/$domain/logs
152152
chmod 640 /var/log/httpd/domains/$domain.*
153153

154154
# Running template trigger

‎bin/v_add_web_domain_cgi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ tpl_file="$V_WEBTPL/apache_$tpl_name.tpl"
5656
# Defining params for ScriptAlias
5757
conf="$V_HOME/$user/conf/httpd.conf"
5858
search_phrase='ScriptAlias '
59-
str_repl=" ScriptAlias /cgi-bin/ $V_HOME/$user/domains/$domain/cgi-bin/"
59+
str_repl=" ScriptAlias /cgi-bin/ $V_HOME/$user/web/$domain/cgi-bin/"
6060
change_web_config
6161

6262
# Defining params for Options
@@ -72,7 +72,7 @@ if [ ! -z "$cert" ]; then
7272
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"
7373
conf="$V_HOME/$user/conf/shttpd.conf"
7474
search_phrase='ScriptAlias '
75-
str_repl=" ScriptAlias /cgi-bin/ $V_HOME/$user/domains/$domain/cgi-bin/"
75+
str_repl=" ScriptAlias /cgi-bin/ $V_HOME/$user/web/$domain/cgi-bin/"
7676
change_web_config
7777

7878
# Defining params for Options

‎bin/v_add_web_domain_nginx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ web_port=$(get_config_value '$WEB_PORT')
6262
proxy_port=$(get_config_value '$PROXY_PORT')
6363
domain_idn=$(idn -t --quiet -a "$domain")
6464
group="$user"
65-
docroot="$V_HOME/$user/domains/$domain/public_html"
65+
docroot="$V_HOME/$user/web/$domain/public_html"
6666
email="$user@$domain"
6767
aliases=$(get_web_domain_value '$ALIAS')
6868
aliases_idn=$(idn -t --quiet -a "$aliases")
@@ -95,8 +95,8 @@ if [ ! -z "$cert" ]; then
9595
ssl_key="$V_HOME/$user/conf/$cert.key"
9696
tpl_option=$(get_web_domain_value '$SSL_HOME')
9797
case $tpl_option in
98-
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;;
99-
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;;
98+
single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
99+
same) docroot="$V_HOME/$user/web/$domain/public_html" ;;
100100
*) check_args '3' "$#" 'user domain certificate [sslhome]'
101101
esac
102102
web_ssl_port=$(get_config_value '$WEB_SSL_PORT')

‎bin/v_add_web_domain_ssl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ email="$user@$domain"
7575
ssl_cert="$V_HOME/$user/conf/$cert.crt"
7676
ssl_key="$V_HOME/$user/conf/$cert.key"
7777
case $tpl_option in
78-
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;;
79-
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;;
78+
single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
79+
same) docroot="$V_HOME/$user/web/$domain/public_html" ;;
8080
*) check_args '3' "$#" 'user domain certificate [sslhome]'
8181
esac
8282
group="$user"

‎bin/v_add_web_domain_stat_auth‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ is_domain_suspended 'web_domains'
4848
#----------------------------------------------------------#
4949

5050
# Definining statistic dir
51-
stat_dir="$V_HOME/$user/domains/$domain/stats"
51+
stat_dir="$V_HOME/$user/web/$domain/stats"
5252

5353
# Adding htaccess file
5454
if [ ! -e "$stat_dir/.htaccess" ]; then

‎bin/v_change_web_domain_sslhome‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ search_phrase='DocumentRoot'
6262

6363
# Parsing tpl_option
6464
case $tpl_option in
65-
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;;
66-
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;;
65+
single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
66+
same) docroot="$V_HOME/$user/web/$domain/public_html" ;;
6767
*) check_args '3' "2" 'user domain sslhome'
6868
esac
6969

@@ -78,8 +78,8 @@ ssl_home=$(get_web_domain_value '$SSL_HOME')
7878

7979
# Parsing old sslhome
8080
case $ssl_home in
81-
single) dirroot="$V_HOME/$user/domains/$domain/public_shtml" ;;
82-
same) dirroot="$V_HOME/$user/domains/$domain/public_html" ;;
81+
single) dirroot="$V_HOME/$user/web/$domain/public_shtml" ;;
82+
same) dirroot="$V_HOME/$user/web/$domain/public_html" ;;
8383
*) check_args '3' "2" 'user domain sslhome'
8484
esac
8585

‎bin/v_change_web_domain_tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ aliases=$(get_web_domain_value '$ALIAS')
7777
aliases_idn=$(idn -t --quiet -a "$aliases")
7878
web_port=$(get_config_value '$WEB_PORT')
7979
email="$user@$domain"
80-
docroot="$V_HOME/$user/domains/$domain/public_html"
80+
docroot="$V_HOME/$user/web/$domain/public_html"
8181
conf="$V_HOME/$user/conf/httpd.conf"
8282
tpl_file="$V_WEBTPL/apache_$template.tpl"
8383
group="$user"
@@ -111,8 +111,8 @@ if [ ! -z "$cert" ]; then
111111
ssl_cert="$V_HOME/$user/conf/$cert.crt"
112112
ssl_key="$V_HOME/$user/conf/$cert.key"
113113
case $tpl_option in
114-
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;;
115-
*) docroot="$V_HOME/$user/domains/$domain/public_html" ;;
114+
single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
115+
*) docroot="$V_HOME/$user/web/$domain/public_html" ;;
116116
esac
117117
conf="$V_HOME/$user/conf/shttpd.conf"
118118
tpl_file="$V_WEBTPL/apache_$template.stpl"

‎bin/v_del_web_domain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ conf="$V_HOME/$user/conf/httpd.conf"
5555

5656
# Deleting domain
5757
del_web_config
58-
exit
58+
5959
# Checking ssl
6060
cert=$(get_web_domain_value '$SSL_CERT')
6161
if [ ! -z "$cert" ]; then
@@ -85,7 +85,7 @@ if [ ! -z "$stats_type" ] && [ "$stats_type" != 'no' ]; then
8585
fi
8686

8787
# Deleting directory
88-
rm -rf $V_HOME/$user/domains/$domain
88+
rm -rf $V_HOME/$user/web/$domain
8989

9090
# Deleting logs
9191
rm -rf /var/log/httpd/domains/$domain.log*

‎bin/v_del_web_domain_cgi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ tpl_file="$V_WEBTPL/apache_$tpl_name.tpl"
5656
# Defining params for ScriptAlias
5757
conf="$V_HOME/$user/conf/httpd.conf"
5858
search_phrase='ScriptAlias '
59-
str_repl=" #ScriptAlias /cgi-bin/ $V_HOME/$user/domains/$domain/cgi-bin"
59+
str_repl=" #ScriptAlias /cgi-bin/ $V_HOME/$user/web/$domain/cgi-bin"
6060
change_web_config
6161

6262
# Defining params for Options
@@ -72,7 +72,7 @@ if [ ! -z "$cert" ]; then
7272
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"
7373
conf="$V_HOME/$user/conf/shttpd.conf"
7474
search_phrase='ScriptAlias '
75-
str_repl=" #ScriptAlias /cgi-bin/ $V_HOME/$user/domains/$domain/cgi-bin"
75+
str_repl=" #ScriptAlias /cgi-bin/ $V_HOME/$user/web/$domain/cgi-bin"
7676
change_web_config
7777

7878
# Defining params for Options

0 commit comments

Comments
 (0)