Subversion Repositories ALCASAR

Compare Revisions

Regard whitespace Rev 2584 → Rev 2585

/scripts/alcasar-conf.sh
144,9 → 144,11
## rewrite /etc/hosts file managing hostname resolution
PRIVATE_IP=`grep ^PRIVATE_IP= $CONF_FILE|cut -d"=" -f2|cut -d"/" -f1`
HOSTNAME=`grep ^HOSTNAME= $CONF_FILE|cut -d"=" -f2`
domainNames="$HOSTNAME $HOSTNAME.$DOMAIN"
[ "$HOSTNAME" != 'alcasar' ] && domainNames="alcasar $domainNames"
cat << EOF > $DIR_UPDATE/etc/hosts
127.0.0.1 localhost
$PRIVATE_IP $HOSTNAME
$PRIVATE_IP $domainNames
EOF
## apache & dansguardian are replaced with lighttpd & EĀ²guardian
rm_rpm="apache apache-mod_php apache-mod_ssl dansguardian"
336,9 → 338,12
# Set hostname
hostnamectl set-hostname $HOSTNAME.$DOMAIN
# /etc/hosts
domainNames="$HOSTNAME $HOSTNAME.$DOMAIN"
[ "$HOSTNAME" != 'alcasar' ] && domainNames="alcasar $domainNames"
$SED "/^$PRIVATE_IP\t/d" /etc/hosts
$SED "/$HOSTNAME$/d" /etc/hosts
echo "$PRIVATE_IP $HOSTNAME" >> /etc/hosts
$SED "/\s$HOSTNAME\s\$/d" /etc/hosts
[ "$HOSTNAME" != 'alcasar' ] && $SED "/\salcasar\s\$/d" /etc/hosts
echo "$PRIVATE_IP $domainNames" >> /etc/hosts
# Lighttpd
$SED "s?^server\.bind.*?server\.bind = \"$HOSTNAME.$DOMAIN\"?g" /etc/lighttpd/lighttpd.conf
$SED 's/^$SERVER\["socket"\] == ".*:443.*/$SERVER\["socket"\] == "'"$HOSTNAME.$DOMAIN"':443" {/g' /etc/lighttpd/vhosts.d/alcasar.conf