github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-21 13:54:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:serghey-rodin/vesta

Browse source
This commit is contained in:
Malishev Dmitry 2015-02-03 12:21:25 -05:00
commit 7991911799
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-delete-remote-dns-domain
View file

@ -49,7 +49,7 @@ old_ifs="$IFS"
IFS=$'\n' IFS=$'\n'
# Starting cluster loop # Starting cluster loop
for cluster_str in $(grep SUSPENDED='no' $VESTA/conf/dns-cluster.conf); do for cluster_str in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
# Get host values # Get host values
eval $cluster_str eval $cluster_str

2
bin/v-suspend-web-domain
View file

@ -73,7 +73,7 @@ fi
# Checking proxy SSL # Checking proxy SSL
if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
tpl_file="$WEBTPL/$PROXY_SSL/$PROXY.stpl" tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
del_web_config del_web_config
add_web_config add_web_config

2
install/rhel/roundcube-main.conf
View file

@ -439,7 +439,7 @@ $rcmail_config['trash_mbox'] = 'Trash';
$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); $rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash');
// automatically create the above listed default folders on first login // automatically create the above listed default folders on first login
$rcmail_config['create_default_folders'] = false; $rcmail_config['create_default_folders'] = true;
// protect the default folders from renames, deletes, and subscription changes // protect the default folders from renames, deletes, and subscription changes
$rcmail_config['protect_default_folders'] = true; $rcmail_config['protect_default_folders'] = true;