Skip to content

Commit 9e3474f

Browse files
naumov-socolovnaumov-socolov
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents b7128dd + db04a00 commit 9e3474f

File tree

5 files changed

+49
-28
lines changed

5 files changed

+49
-28
lines changed

‎bin/v-list-web-domain‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ json_list() {
3131
"STATS_USER": "'$STATS_USER'",
3232
"SSL": "'$SSL'",
3333
"SSL_HOME": "'$SSL_HOME'",
34+
"LETSENCRYPT": "'$LETSENCRYPT'",
3435
"FTP_USER": "'$FTP_USER'",
3536
"FTP_PATH": "'$FTP_PATH'",
3637
"AUTH_USER": "'$AUTH_USER'",
@@ -56,6 +57,9 @@ shell_list() {
5657
fi
5758
if [ ! -z "$SSL" ] && [ "$SSL" != 'no' ]; then
5859
echo "SSL: $SSL / $SSL_HOME"
60+
if [ ! -z "$LETSENCRYPT" ] && [ "$LETSENCRYPT" != 'no' ]; then
61+
echo "LETSENCRYPT: $LETSENCRYPT"
62+
fi
5963
fi
6064
echo "TEMPLATE: $TPL"
6165
if [ ! -z "$WEB_BACKEND" ]; then
@@ -84,18 +88,18 @@ shell_list() {
8488
# PLAIN list function
8589
plain_list() {
8690
echo -ne "$DOMAIN\t$IP\t$IP6\t$U_DISK\t$U_BANDWIDTH\t$TPL\t"
87-
echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$SSL_HOME\t"
91+
echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$SSL_HOME\t,$LETSENCRYPT"
8892
echo -ne "$FTP_USER\t$FTP_PATH\t$AUTH_USER\t$BACKEND\t$PROXY\t"
8993
echo -e "$PROXY_EXT\t$SUSPENDED\t$TIME\t$DATE"
9094
}
9195

9296
# CSV list function
9397
csv_list() {
9498
echo -n "DOMAIN,IP,IP6,U_DISK,U_BANDWIDTH,TPL,ALIAS,STATS,STATS_USER,SSL,"
95-
echo -n "SSL_HOME,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,PROXY_EXT,"
99+
echo -n "SSL_HOME,LETSENCRYPT,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,PROXY_EXT,"
96100
echo "SUSPENDED,TIME,DATE"
97101
echo -n "$DOMAIN,$IP,$IP6,$U_DISK,$U_BANDWIDTH,$TPL,\"$ALIAS\",$STATS"
98-
echo -n "\"$STATS_USER\",$SSL,$SSL_HOME,\"$FTP_USER\",\"$FTP_PATH\","
102+
echo -n "\"$STATS_USER\",$SSL,$SSL_HOME,$LETSENCRYPT,\"$FTP_USER\",\"$FTP_PATH\","
99103
echo -n "\"$AUTH_USER\",$BACKEND,$PROXY,\"$PROXY_EXT\",$SUSPENDED,$TIME,"
100104
echo "$DATE"
101105
}

‎bin/v-list-web-domains‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ json_list() {
3535
"STATS_USER": "'$STATS_USER'",
3636
"SSL": "'$SSL'",
3737
"SSL_HOME": "'$SSL_HOME'",
38+
"LETSENCRYPT": "'$LETSENCRYPT'",
3839
"FTP_USER": "'$FTP_USER'",
3940
"FTP_PATH": "'$FTP_PATH'",
4041
"AUTH_USER": "'$AUTH_USER'",
@@ -58,11 +59,11 @@ json_list() {
5859
# SHELL list function
5960
shell_list() {
6061
IFS=$'\n'
61-
echo "DOMAIN IP TPL SSL DISK BW SPND DATE"
62-
echo "------ -- --- --- ---- -- ---- ----"
62+
echo "DOMAIN IP TPL SSL LETSENCRYPT DISK BW SPND DATE "
63+
echo "------ -- --- --- ----------- ---- -- ---- ----------"
6364
while read str; do
6465
eval $str
65-
echo "$DOMAIN $IP $TPL $SSL $U_DISK $U_BANDWIDTH $SUSPENDED $DATE"
66+
echo "$DOMAIN $IP $TPL $SSL $LETSENCRYPT $U_DISK $U_BANDWIDTH $SUSPENDED $DATE"
6667
done < <(cat $USER_DATA/web.conf)
6768
}
6869

@@ -72,7 +73,7 @@ plain_list() {
7273
while read str; do
7374
eval $str
7475
echo -ne "$DOMAIN\t$IP\t$IP6\t$U_DISK\t$U_BANDWIDTH\t$TPL\t"
75-
echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$SSL_HOME\t"
76+
echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$SSL_HOME\t$LETSENCRYPT\t"
7677
echo -ne "$FTP_USER\t$FTP_PATH\t$AUTH_USER\t$BACKEND\t$PROXY\t"
7778
echo -e "$PROXY_EXT\t$SUSPENDED\t$TIME\t$DATE"
7879
done < <(cat $USER_DATA/web.conf)
@@ -82,12 +83,12 @@ plain_list() {
8283
csv_list() {
8384
IFS=$'\n'
8485
echo -n "DOMAIN,IP,IP6,U_DISK,U_BANDWIDTH,TPL,ALIAS,STATS,STATS_USER,"
85-
echo -n "SSL,SSL_HOME,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,"
86+
echo -n "SSL,SSL_HOME,LETSENCRYPT,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,"
8687
echo "PROXY_EXT,SUSPENDED,TIME,DATE"
8788
while read str; do
8889
eval $str
8990
echo -n "$DOMAIN,$IP,$IP6,$U_DISK,$U_BANDWIDTH,$TPL,"
90-
echo -n "\"$ALIAS\",$STATS,\"$STATS_USER\",$SSL,$SSL_HOME,"
91+
echo -n "\"$ALIAS\",$STATS,\"$STATS_USER\",$SSL,$SSL_HOME,$LETSENCRYPT,"
9192
echo -n "\"$FTP_USER\",\"$FTP_PATH\",\"$AUTH_USER\",$BACKEND,$PROXY,"
9293
echo "\"$PROXY_EXT\",$SUSPENDED,$TIME,$DATE"
9394
done < <(cat $USER_DATA/web.conf)

‎web/edit/web/index.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -267,26 +267,26 @@
267267
// Disable Lets Encrypt support
268268

269269
if (( $v_letsencrypt == 'yes' ) && (empty($_POST['v_letsencrypt'])) && (!empty($_POST['v_letsencrypt'])) && (empty($_SESSION['error_msg']))) {
270-
exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '' 'no'", $output, $return_var);
270+
exec (VESTA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." '' 'no'", $output, $return_var);
271271
check_return_code($return_var,$output);
272272
unset($output);
273273
$v_letsencrypt = 'no';
274274
$restart_web = 'yes';
275275
$restart_proxy = 'yes';
276276
}
277-
else {
278-
// Delete SSL certificate
279-
if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
280-
exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var);
281-
$data = json_decode(implode('', $output), true);
282-
exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".$data['ALIAS']."' 'no'", $output, $return_var);
283-
check_return_code($return_var,$output);
284-
unset($output);
285-
$v_ssl = 'no';
286-
$restart_web = 'yes';
287-
$restart_proxy = 'yes';
288-
}
277+
else{
278+
// Delete SSL certificate
279+
if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
280+
exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var);
281+
check_return_code($return_var,$output);
282+
unset($output);
283+
$v_ssl = 'no';
284+
$restart_web = 'yes';
285+
$restart_proxy = 'yes';
286+
}
289287
}
288+
289+
// Enable Lets Encrypt support
290290
if (( $v_letsencrypt == 'no' || empty( $v_letsencrypt)) && (!empty($_POST['v_letsencrypt'])) && empty($_SESSION['error_msg'])) {
291291
exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var);
292292
$data = json_decode(implode('', $output), true);

‎web/js/pages/edit_web.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
135135
App.Actions.WEB.toggle_letsencrypt = function(elm) {
136136
if ($(elm).attr('checked')) {
137137
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
138-
//$('input[name=v_ssl]').prop('checked', true);
139-
//$('#ssltable').show();
138+
$('input[name=v_ssl]').prop('checked', true);
139+
$('#ssltable').show();
140140
$('#generate-csr').hide();
141141
}
142142
else {
143143
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled');
144-
//$('input[name=v_ssl]').prop('checked', false);
145-
//$('#ssltable').hide();
144+
$('input[name=v_ssl]').prop('checked', false);
145+
$('#ssltable').hide();
146146
$('#generate-csr').show();
147147
}
148148
}
@@ -180,8 +180,9 @@ $(function() {
180180
var elm = $(evt.target);
181181
App.Actions.WEB.passwordChanged(elm);
182182
});
183-
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'));
184-
183+
if ($('input[name=v_letsencrypt]').attr('checked')) {
184+
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'))
185+
}
185186
$('select[name="v_stats"]').change(function(evt){
186187
var select = $(evt.target);
187188

‎web/templates/admin/list_web.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,21 @@
266266
<? } ?>
267267
</td>
268268
</tr>
269+
<tr>
270+
<td></td>
271+
<td>
272+
<? if(empty($data[$key]['LETSENCRYPT']) || $data[$key]['LETSENCRYPT'] == 'no') { ?>
273+
<div class="l-unit__stat-cols clearfix disabled"><?=__('Lets Encrypt Support')?></div>
274+
<? } else {?>
275+
<div class="l-unit__stat-cols clearfix">
276+
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Lets Encrypt Support')?>:</div>
277+
<div class="l-unit__stat-col l-unit__stat-col--right">
278+
<b><?=__($data[$key]['LETSENCRYPT'])?></b>
279+
</div>
280+
</div>
281+
<? } ?>
282+
</td>
283+
</tr>
269284
<tr>
270285
<td>
271286
<div class="l-unit__stat-cols clearfix graph">

0 commit comments

Comments
 (0)