Skip to content

Commit faefc83

Browse files
author
Kristan Kenney
committed
Update add force ssl function
1 parent 5463eb7 commit faefc83

5 files changed

Lines changed: 25 additions & 20 deletions

File tree

‎bin/v-add-web-domain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ date=$(echo "$time_n_date" |cut -f 2 -d \ )
165165

166166
# Adding domain in web.conf
167167
echo "DOMAIN='$domain' IP='$ip' IP6='' ALIAS='$ALIAS' TPL='$WEB_TEMPLATE'\
168-
SSL='no' SSL_HOME='same' LETSENCRYPT='no' FTP_USER='' FTP_MD5=''\
168+
SSL='no' FORCESSL='no' SSL_HOME='same' LETSENCRYPT='no' FTP_USER='' FTP_MD5=''\
169169
BACKEND='$BACKEND_TEMPLATE' PROXY='$PROXY_TEMPLATE' PROXY_EXT='$PROXY_EXT'\
170170
STATS='' STATS_USER='' STATS_CRYPT='' U_DISK='0' U_BANDWIDTH='0'\
171171
SUSPENDED='no' TIME='$time' DATE='$date'" >> $USER_DATA/web.conf

‎bin/v-add-web-domain-ssl-force‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ source $HESTIA/conf/hestia.conf
2323
#----------------------------------------------------------#
2424

2525
check_args '2' "$#" 'USER DOMAIN'
26-
is_format_valid 'user' 'domain' 'ssl_dir'
26+
is_format_valid 'user' 'domain'
2727
is_object_valid 'user' 'USER' "$user"
2828
is_object_unsuspended 'user' 'USER' "$user"
2929
is_object_valid 'web' 'DOMAIN' "$domain"
@@ -68,7 +68,7 @@ fi
6868
# Hestia #
6969
#----------------------------------------------------------#
7070

71-
add_object_key "web" 'DOMAIN' "$domain" 'FORCESSL'
71+
# Set forcessl flag to enabled
7272
update_object_value 'web' 'DOMAIN' "$domain" '$FORCESSL' 'yes'
7373

7474
# Restart web server

‎bin/v-delete-web-domain-ssl-force‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ restart=$3
1616

1717
# Includes
1818
source $HESTIA/func/main.sh
19-
19+
source $HESTIA/conf/hestia.conf
2020

2121
#----------------------------------------------------------#
2222
# Verifications #
2323
#----------------------------------------------------------#
2424

2525
check_args '2' "$#" 'USER DOMAIN'
26-
is_format_valid 'user' 'domain' 'ssl_dir'
26+
is_format_valid 'user' 'domain'
2727
is_object_valid 'user' 'USER' "$user"
2828
is_object_unsuspended 'user' 'USER' "$user"
2929
is_object_valid 'web' 'DOMAIN' "$domain"
3030
is_object_unsuspended 'web' 'DOMAIN' "$domain"
31-
31+
is_object_valid 'web' 'DOMAIN' "$domain" "$FORCESSL"
3232

3333
#----------------------------------------------------------#
3434
# Action #
@@ -41,11 +41,12 @@ eval $(grep "DOMAIN='$domain'" $USER_DATA/web.conf)
4141
rm -f $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.forcessl.conf
4242
rm -f $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.forcessl.conf
4343

44-
4544
#----------------------------------------------------------#
4645
# Hestia #
4746
#----------------------------------------------------------#
4847

48+
update_object_value 'web' 'DOMAIN' "$domain" '$FORCESSL' 'no'
49+
4950
# Restart services if requested
5051
if [ ! -z "$restart" ]; then
5152
$BIN/v-restart-web

‎bin/v-list-web-domain‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ json_list() {
3030
"STATS": "'$STATS'",
3131
"STATS_USER": "'$STATS_USER'",
3232
"SSL": "'$SSL'",
33+
"FORCESSL": "'$FORCESSL'",
3334
"SSL_HOME": "'$SSL_HOME'",
3435
"LETSENCRYPT": "'$LETSENCRYPT'",
3536
"FTP_USER": "'$FTP_USER'",
@@ -60,6 +61,9 @@ shell_list() {
6061
if [ ! -z "$LETSENCRYPT" ] && [ "$LETSENCRYPT" != 'no' ]; then
6162
echo "LETSENCRYPT: $LETSENCRYPT"
6263
fi
64+
if [ ! -z "$FORCESSL" ]; then
65+
echo "FORCESSL: $FORCESSL"
66+
fi
6367
fi
6468
echo "TEMPLATE: $TPL"
6569
if [ ! -z "$WEB_BACKEND" ]; then
@@ -88,15 +92,15 @@ shell_list() {
8892
# PLAIN list function
8993
plain_list() {
9094
echo -ne "$DOMAIN\t$IP\t$IP6\t$U_DISK\t$U_BANDWIDTH\t$TPL\t"
91-
echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$SSL_HOME\t,$LETSENCRYPT"
95+
echo -ne "$ALIAS\t$STATS\t$STATS_USER\t$SSL\t$FORCESSL\t$SSL_HOME\t,$LETSENCRYPT"
9296
echo -ne "$FTP_USER\t$FTP_PATH\t$AUTH_USER\t$BACKEND\t$PROXY\t"
9397
echo -e "$PROXY_EXT\t$SUSPENDED\t$TIME\t$DATE"
9498
}
9599

96100
# CSV list function
97101
csv_list() {
98102
echo -n "DOMAIN,IP,IP6,U_DISK,U_BANDWIDTH,TPL,ALIAS,STATS,STATS_USER,SSL,"
99-
echo -n "SSL_HOME,LETSENCRYPT,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,PROXY_EXT,"
103+
echo -n "FORCESSL,SSL_HOME,LETSENCRYPT,FTP_USER,FTP_PATH,AUTH_USER,BACKEND,PROXY,PROXY_EXT,"
100104
echo "SUSPENDED,TIME,DATE"
101105
echo -n "$DOMAIN,$IP,$IP6,$U_DISK,$U_BANDWIDTH,$TPL,\"$ALIAS\",$STATS"
102106
echo -n "\"$STATS_USER\",$SSL,$SSL_HOME,$LETSENCRYPT,\"$FTP_USER\",\"$FTP_PATH\","

‎web/edit/web/index.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
$v_ssl_signature = $ssl_str[$v_domain]['SIGNATURE'];
5050
$v_ssl_pub_key = $ssl_str[$v_domain]['PUB_KEY'];
5151
$v_ssl_issuer = $ssl_str[$v_domain]['ISSUER'];
52-
$v_ssl_forcessl = $ssl_str[$v_domain]['FORCESSL'];
52+
$v_ssl_forcessl = $data[$v_domain]['FORCESSL'];
5353
}
5454
$v_letsencrypt = $data[$v_domain]['LETSENCRYPT'];
5555
if (empty($v_letsencrypt)) $v_letsencrypt = 'no';
@@ -339,7 +339,7 @@
339339

340340
// Delete Lets Encrypt support
341341
if (( $v_letsencrypt == 'yes' ) && (empty($_POST['v_letsencrypt'])) && (empty($_SESSION['error_msg']))) {
342-
exec (HESTIA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." ''", $output, $return_var);
342+
exec (HESTIA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." 'no'", $output, $return_var);
343343
check_return_code($return_var,$output);
344344
unset($output);
345345
$v_ssl_crt = '';
@@ -369,7 +369,7 @@
369369
// Add Lets Encrypt support
370370
if ((!empty($_POST['v_ssl'])) && ( $v_letsencrypt == 'no' ) && (!empty($_POST['v_letsencrypt'])) && empty($_SESSION['error_msg'])) {
371371
$l_aliases = str_replace("\n", ',', $v_aliases);
372-
exec (HESTIA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".$l_aliases."' ''", $output, $return_var);
372+
exec (HESTIA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".$l_aliases."' 'no'", $output, $return_var);
373373
check_return_code($return_var,$output);
374374
unset($output);
375375
$v_letsencrypt = 'yes';
@@ -446,14 +446,6 @@
446446
}
447447
}
448448

449-
// Add Force SSL
450-
if ((!empty($_POST['v_ssl_forcessl'])) && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
451-
exec (HESTIA_CMD."v-add-web-domain-ssl-force ".$user." ".$v_domain, $output, $return_var);
452-
check_return_code($return_var,$output);
453-
unset($output);
454-
$v_ssl_forcessl = 'yes';
455-
}
456-
457449
// Delete Force SSL
458450
if (( $v_ssl_forcessl == 'yes' ) && (empty($_POST['v_ssl_forcessl'])) && (empty($_SESSION['error_msg']))) {
459451
exec (HESTIA_CMD."v-delete-web-domain-ssl-force ".$user." ".$v_domain." yes", $output, $return_var);
@@ -462,6 +454,14 @@
462454
$v_ssl_forcessl = 'no';
463455
}
464456

457+
// Add Force SSL
458+
if ((!empty($_POST['v_ssl_forcessl'])) && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
459+
exec (HESTIA_CMD."v-add-web-domain-ssl-force ".$user." ".$v_domain, $output, $return_var);
460+
check_return_code($return_var,$output);
461+
unset($output);
462+
$v_ssl_forcessl = 'yes';
463+
}
464+
465465
// Delete web stats
466466
if ((!empty($v_stats)) && ($_POST['v_stats'] == 'none') && (empty($_SESSION['error_msg']))) {
467467
exec (HESTIA_CMD."v-delete-web-domain-stats ".$v_username." ".$v_domain, $output, $return_var);

0 commit comments

Comments
 (0)