Skip to content

Commit 7991911

Browse files
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents 54bfc46 + 9a84ee4 commit 7991911

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

bin/v-delete-remote-dns-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ old_ifs="$IFS"
4949
IFS=$'\n'
5050

5151
# Starting cluster loop
52-
for cluster_str in $(grep SUSPENDED='no' $VESTA/conf/dns-cluster.conf); do
52+
for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
5353

5454
# Get host values
5555
eval $cluster_str

bin/v-suspend-web-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fi
7373

7474
# Checking proxy SSL
7575
if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
76-
tpl_file="$WEBTPL/$PROXY_SSL/$PROXY.stpl"
76+
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
7777
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
7878
del_web_config
7979
add_web_config

install/rhel/roundcube-main.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ $rcmail_config['trash_mbox'] = 'Trash';
439439
$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash');
440440

441441
// automatically create the above listed default folders on first login
442-
$rcmail_config['create_default_folders'] = false;
442+
$rcmail_config['create_default_folders'] = true;
443443

444444
// protect the default folders from renames, deletes, and subscription changes
445445
$rcmail_config['protect_default_folders'] = true;

0 commit comments

Comments
 (0)