Skip to content

Commit 0faa709

Browse files
author
Kristan Kenney
committed
Change demo mode restrictions
1 parent 312cafd commit 0faa709

File tree

9 files changed

+1
-24
lines changed

9 files changed

+1
-24
lines changed

bin/v-add-database

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ is_package_full 'DATABASES'
4949
is_password_valid
5050
dbpass="$password"
5151

52-
# Perform verification if read-only mode is enabled
53-
check_hestia_demo_mode
54-
5552
#----------------------------------------------------------#
5653
# Action #
5754
#----------------------------------------------------------#

bin/v-add-dns-domain

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ is_package_full 'DNS_DOMAINS'
5050
template=$(get_user_value '$DNS_TEMPLATE')
5151
is_dns_template_valid $template
5252

53-
# Perform verification if read-only mode is enabled
54-
check_hestia_demo_mode
55-
5653
if [ ! -z "$ns1" ]; then
5754
ns1=$(echo $4 |sed -e 's/\.*$//g' -e 's/^\.*//g')
5855
is_format_valid 'ns1'

bin/v-add-mail-domain

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ is_domain_new 'mail' "$domain"
4848
is_package_full 'MAIL_DOMAINS'
4949
is_dir_symlink $HOMEDIR/$user/mail
5050

51-
# Perform verification if read-only mode is enabled
52-
check_hestia_demo_mode
53-
5451
#----------------------------------------------------------#
5552
# Action #
5653
#----------------------------------------------------------#

bin/v-add-web-domain

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ format_domain
3535
format_domain_idn
3636
format_aliases
3737

38-
# Perform verification if read-only mode is enabled
39-
check_hestia_demo_mode
40-
4138
#----------------------------------------------------------#
4239
# Verifications #
4340
#----------------------------------------------------------#

bin/v-delete-database

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ is_object_unsuspended 'user' 'USER' "$user"
3232
is_object_valid 'db' 'DB' "$database"
3333
is_object_unsuspended 'db' 'DB' "$database"
3434

35-
# Perform verification if read-only mode is enabled
36-
check_hestia_demo_mode
3735

3836
#----------------------------------------------------------#
3937
# Action #

bin/v-delete-dns-domain

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ is_object_valid 'dns' 'DOMAIN' "$domain"
3434
is_object_unsuspended 'dns' 'DOMAIN' "$domain"
3535

3636

37-
# Perform verification if read-only mode is enabled
38-
check_hestia_demo_mode
39-
4037
#----------------------------------------------------------#
4138
# Action #
4239
#----------------------------------------------------------#

bin/v-delete-mail-domain

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ is_object_valid 'mail' 'DOMAIN' "$domain"
3838
is_object_unsuspended 'mail' 'DOMAIN' "$domain"
3939

4040

41-
# Perform verification if read-only mode is enabled
42-
check_hestia_demo_mode
43-
4441
#----------------------------------------------------------#
4542
# Action #
4643
#----------------------------------------------------------#

bin/v-delete-web-domain

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ is_object_unsuspended 'user' 'USER' "$user"
4242
is_object_valid 'web' 'DOMAIN' "$domain"
4343
is_object_unsuspended 'web' 'DOMAIN' "$domain"
4444

45-
# Perform verification if read-only mode is enabled
46-
check_hestia_demo_mode
47-
4845
#----------------------------------------------------------#
4946
# Action #
5047
#----------------------------------------------------------#

func/main.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ download_file() {
10131013
check_hestia_demo_mode() {
10141014
demo_mode=$(grep DEMO_MODE /usr/local/hestia/conf/hestia.conf | cut -d '=' -f2 | sed "s|'||g")
10151015
if [ ! -z "$demo_mode" ] && [ "$demo_mode" = "yes" ]; then
1016-
echo "ERROR: Unable to perform operation when demo mode is enabled."
1016+
echo "ERROR: Unable to perform operation due to security restrictions that are in place."
10171017
exit 1
10181018
fi
10191019
}

0 commit comments

Comments
 (0)