Upadted formating

This commit is contained in:
Serghey Rodin 2014-07-29 20:46:00 +03:00
commit 6cd65c593d
7 changed files with 324 additions and 194 deletions

View file

@ -233,9 +233,6 @@ if [ -z $email ]; then
if [ -z "$servername" ]; then
read -p "Please enter hostname [$(hostname)]: " servername
fi
if [ -z "$servername" ]; then
servername=$(hostname)
fi
fi
# Validate email
@ -464,6 +461,9 @@ if [ "$srv_type" = 'micro' ] || [ "$srv_type" = 'small' ]; then
fi
# Set server hostname
if [ -z "$servername" ]; then
servername=$(hostname)
fi
/usr/local/vesta/bin/v-change-sys-hostname $servername 2>/dev/null
# Templates
@ -627,9 +627,9 @@ fi
# Exim
wget $CHOST/$VERSION/exim4.conf.template -O /etc/exim4/exim4.conf.template
if [ "$srv_type" = 'micro' ] || [ "$srv_type" = 'small' ]; then
sed -i "s/^SPAMASSASSIN/#SPAMASSASSIN/g" /etc/exim4/exim4.conf.template
sed -i "s/^CLAMD/#CLAMD/g" /etc/exim4/exim4.conf.template
if [ "$srv_type" != 'micro' ] && [ "$srv_type" != 'small' ]; then
sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template
sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template
fi
wget $CHOST/$VERSION/dnsbl.conf -O /etc/exim4/dnsbl.conf
wget $CHOST/$VERSION/spam-blocks.conf -O /etc/exim4/spam-blocks.conf