Skip to content

Commit 0b5cf52

Browse files
serghey-rodinserghey-rodin
committed
extended %elog% support
1 parent 380f389 commit 0b5cf52

File tree

4 files changed

+64
-21
lines changed

4 files changed

+64
-21
lines changed

‎bin/v_add_web_domain‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,26 @@ else
8181
fi
8282

8383
# Defining vars for httpd_add_config function
84-
port=$(get_config_value '$WEB_PORT')
84+
web_port=$(get_config_value '$WEB_PORT')
8585
group="$user"
8686
email="$user@$domain"
8787
docroot="$V_HOME/$user/domains/$domain/public_html"
8888
conf="$V_HOME/$user/conf/httpd.conf"
8989
tpl_file="$V_WEBTPL/apache_$template.tpl"
9090

91+
# Parsing template keys
92+
template_data=$(cat $V_WEBTPL/apache_$template.descr|grep -v '#')
93+
for keys in $template_data; do
94+
eval ${keys%%=*}=${keys#*=}
95+
done
96+
97+
# Checking error log status
98+
if [ "$ELOG" = 'no' ]; then
99+
elog=' #'
100+
else
101+
elog=' '
102+
fi
103+
91104
# Adding domain to the httpd.conf
92105
httpd_add_config
93106

@@ -139,8 +152,8 @@ chmod 551 $V_HOME/$user/domains/$domain/logs
139152
chmod 640 /var/log/httpd/domains/$domain.*
140153

141154
# Running template trigger
142-
if [ -e $V_WEBTPL/apache_$template.sh ]; then
143-
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot $port
155+
if [ -x $V_WEBTPL/apache_$template.sh ]; then
156+
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot
144157
fi
145158

146159
# Checking main vesta httpd config
@@ -162,7 +175,6 @@ increase_ip_value
162175
increase_user_value "$user" '$U_WEB_DOMAINS'
163176

164177
# Defining domain variables
165-
template_data=$(cat $V_WEBTPL/apache_$template.descr|grep -v '#')
166178
v_str="DOMAIN='$domain'"
167179
v_str="$v_str IP='$ip'"
168180
v_str="$v_str U_DISK='0'"

‎bin/v_add_web_domain_ssl‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ is_template_valid 'web'
6868
#----------------------------------------------------------#
6969

7070
# Defining variables for template replace
71-
port=$(get_config_value '$WEB_SSL_PORT')
71+
web_ssl_port=$(get_config_value '$WEB_SSL_PORT')
7272
aliases=$(get_web_domain_value '$ALIAS')
7373
aliases_idn=$(idn -t --quiet -a "$aliases")
7474
email="$user@$domain"
@@ -83,6 +83,14 @@ group="$user"
8383
conf="$V_HOME/$user/conf/shttpd.conf"
8484
tpl_file="$V_WEBTPL/apache_$template.stpl"
8585

86+
# Checking error log status
87+
elog=$(get_web_domain_value '$ELOG')
88+
if [ "$elog" = 'no' ]; then
89+
elog=' #'
90+
else
91+
elog=' '
92+
fi
93+
8694
# Adding domain to the httpd.conf
8795
httpd_add_config
8896

@@ -93,8 +101,8 @@ if [ ! -e "$ssl_cert" ]; then
93101
fi
94102

95103
# Running template trigger
96-
if [ -e $V_WEBTPL/apache_$template.sh ]; then
97-
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot $port
104+
if [ -x $V_WEBTPL/apache_$template.sh ]; then
105+
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot
98106
fi
99107

100108
# Checking main vesta httpd config

‎bin/v_change_web_domain_tpl‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
# Argument defenition
99
user="$1"
10-
domain="$2"
10+
domain=$(idn -t --quiet -u "$2" )
11+
domain_idn=$(idn -t --quiet -a "$domain")
1112
template="$3"
1213

1314
# Importing variables
@@ -73,25 +74,39 @@ fi
7374
# Defining variables for template replace
7475
ip=$(get_web_domain_value '$IP')
7576
aliases=$(get_web_domain_value '$ALIAS')
76-
port=$(get_config_value '$WEB_PORT')
77+
aliases_idn=$(idn -t --quiet -a "$aliases")
78+
web_port=$(get_config_value '$WEB_PORT')
7779
email="$user@$domain"
7880
docroot="$V_HOME/$user/domains/$domain/public_html"
7981
conf="$V_HOME/$user/conf/httpd.conf"
8082
tpl_file="$V_WEBTPL/apache_$template.tpl"
8183
group="$user"
8284

85+
# Parsing template keys
86+
template_data=$(cat $V_WEBTPL/apache_$template.descr|grep -v '#')
87+
for keys in $template_data; do
88+
eval ${keys%%=*}=${keys#*=}
89+
done
90+
91+
# Checking error log status
92+
if [ "$ELOG" = 'no' ]; then
93+
elog=' #'
94+
else
95+
elog=' '
96+
fi
97+
8398
# Adding domain to the httpd.conf
8499
httpd_add_config
85100

86-
# Running template post setup file
87-
if [ -e $V_WEBTPL/apache_$template.sh ]; then
88-
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot $port
101+
# Running template trigger
102+
if [ -x $V_WEBTPL/apache_$template.sh ]; then
103+
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot
89104
fi
90105

91106
# Checking ssl
92107
if [ "$ssl" = 'yes' ]; then
93108
# Defining variables for ssl template replace
94-
port=$(get_config_value '$WEB_SSL_PORT')
109+
web_ssl_port=$(get_config_value '$WEB_SSL_PORT')
95110
tpl_option=$(get_web_domain_value '$SSL_HOME')
96111
cert=$(get_web_domain_value '$SSL_CERT')
97112
ssl_cert="$V_HOME/$user/conf/$cert.crt"
@@ -106,10 +121,10 @@ if [ "$ssl" = 'yes' ]; then
106121
# Adding domain to the httpd.conf
107122
httpd_add_config
108123

109-
# Running template post setup file
110-
if [ -e $V_WEBTPL/apache_$template.sh ]; then
124+
# Running template trigger
125+
if [ -x $V_WEBTPL/apache_$template.sh ]; then
111126
$V_WEBTPL/apache_$template.sh \
112-
"$user" "$domain" "$ip" "$V_HOME" "$docroot" "$port"
127+
"$user" "$domain" "$ip" "$V_HOME" "$docroot"
113128
fi
114129
fi
115130

‎bin/v_rebuild_web_domains‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ for domain in $domains; do
5858
template=$(get_web_domain_value '$TPL')
5959
tpl_file="$V_WEBTPL/apache_$template.tpl"
6060
ip=$(get_web_domain_value '$IP')
61-
port=$(get_config_value '$WEB_PORT')
61+
web_port=$(get_config_value '$WEB_PORT')
6262
domain=$(get_web_domain_value '$DOMAIN')
6363
domain_idn=$(idn -t --quiet -a "$domain")
6464
group="$user"
@@ -67,13 +67,21 @@ for domain in $domains; do
6767
aliases=$(get_web_domain_value '$ALIAS')
6868
aliases_idn=$(idn -t --quiet -a "$aliases")
6969

70+
# Checking error log status
71+
elog=$(get_web_domain_value '$ELOG')
72+
if [ "$elog" = 'no' ]; then
73+
elog=' #'
74+
else
75+
elog=' '
76+
fi
77+
7078
# Adding domain to the tmp_httpd.conf
7179
conf="$V_HOME/$user/conf/tmp_httpd.conf"
7280
httpd_add_config
7381

7482
# Running template trigger
7583
if [ -x $V_WEBTPL/apache_$template.sh ]; then
76-
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot $port
84+
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot
7785
fi
7886

7987
# Checking ssl
@@ -89,16 +97,16 @@ for domain in $domains; do
8997
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;;
9098
*) check_args '3' "$#" 'user domain certificate [sslhome]'
9199
esac
92-
port=$(get_config_value '$WEB_SSL_PORT')
100+
web_ssl_port=$(get_config_value '$WEB_SSL_PORT')
93101

94102
# Adding domain to the httpd.conf
95103
conf="$V_HOME/$user/conf/tmp_shttpd.conf"
96104
tpl_file="$V_WEBTPL/apache_$template.stpl"
97105
httpd_add_config
98106

107+
# Running template trigger
99108
if [ -x $V_WEBTPL/apache_$template.sh ]; then
100-
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME \
101-
$docroot $port
109+
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot
102110
fi
103111
fi
104112
done

0 commit comments

Comments
 (0)