Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2860 → Rev 2861

/alcasar.sh
560,18 → 560,6
DNS2=`cat /etc/sysconfig/network-scripts/ifcfg-$EXTIF | grep '^DNS2=' | cut -d"=" -f2` # 2nd DNS server
DNS1=${DNS1:=208.67.220.220}
DNS2=${DNS2:=208.67.222.222}
# if [ "$DNS1" == "" ]
# then
# if [ $Lang == "fr" ]
# then
# echo "L'adresse IP des serveurs DNS ne sont pas corrects"
# echo "Vérifiez la configuration de la carte réseau externe ($EXTIF)"
# else
# echo "The IP address of DNS servers are not set correctly"
# echo "Check the extern network card configuration ($EXTIF)"
# fi
# exit 0
# fi
PUBLIC_NETMASK=`/bin/ipcalc -m $PUBLIC_IP_MASK | cut -d"=" -f2`
PUBLIC_PREFIX=`/bin/ipcalc -p $PUBLIC_IP $PUBLIC_NETMASK|cut -d"=" -f2`
PUBLIC_NETWORK=`/bin/ipcalc -n $PUBLIC_IP/$PUBLIC_PREFIX|cut -d"=" -f2`
1549,7 → 1537,6
## name: "<your_domain>."
## forward-addr: <@IP_domain_server>
##
## INFO : local hostnames are resolved in /etc/hosts file
EOF
 
# Configuration file of ALCASAR main domains for $INTIF
1644,10 → 1631,10
define-tag: "whitelist"
local-zone: "." transparent
local-zone-tag: "." "whitelist"
include: /etc/unbound/conf.d/common/local-forward/*
include: /etc/unbound/conf.d/common/local-dns/*
include: /etc/unbound/conf.d/whitelist/*
include: /usr/local/share/unbound-wl-enabled/*
include: /etc/unbound/conf.d/whitelist/*
include: /etc/unbound/conf.d/common/local-dns/*
include: /etc/unbound/conf.d/common/local-forward/*
forward-zone:
name: "."
forward-addr: 127.0.0.1@55
1674,8 → 1661,9
hide-version: yes
hide-identity: yes
do-ip6: no
include: /etc/unbound/conf.d/common/local-forward/*
include: /etc/unbound/conf.d/common/local-dns/*
include: /etc/unbound/conf.d/blackhole/*
include: /etc/unbound/conf.d/common/local-forward/*
EOF
 
if [ ! -e /lib/systemd/system/unbound.service.default ]