ffhb
/
dns
mirror of https://github.com/FreifunkBremen/ffhb-dns
1
0
Fork 0
Code Issues Releases Wiki Activity

updated script

This commit is contained in:
mortzu 2015-01-16 16:13:12 +01:00
parent 7a653dc6a7
commit 5b4c85b9fe
3 changed files with 32 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
data/me.ffhb.zone → data/bremen.freifunk.net.zone
View File

@ -1,6 +1,6 @@
$TTL 1D $TTL 1D
@ IN SOA ns01 noc.bremen.freifunk.net. ( @ IN SOA ns01 noc.bremen.freifunk.net. (
2014092801 ; Serial 2015011601 ; Serial
4H ; Refresh 4H ; Refresh
1H ; Retry 1H ; Retry
2W ; Expire 2W ; Expire
@ -13,17 +13,10 @@ $TTL 1D
MX 50 mail MX 50 mail
; pages.github.com ; pages.github.com
A 192.30.252.153 A 37.72.148.168
A 192.30.252.154 AAAA 2a02:2918:506:101::168
; network stuff ; network stuff
gw01 A 185.55.119.1
AAAA 2a02:2919::1
gw02 A 185.55.119.2
AAAA 2a02:2919::2
noc01 A 185.55.119.18
AAAA 2a02:2919:fdda::18
ns01 A 37.72.148.55 ns01 A 37.72.148.55
AAAA 2a02:2918:505:101::55 AAAA 2a02:2918:505:101::55
ns02 A 37.72.148.163 ns02 A 37.72.148.163
@ -31,12 +24,12 @@ ns02 A 37.72.148.163
ns03 A 151.236.28.15 ns03 A 151.236.28.15
AAAA 2a00:1768:1003:151:236:28:15:1 AAAA 2a00:1768:1003:151:236:28:15:1
vpn01 A 185.55.119.34 vpn01 30s A 37.72.148.148
AAAA 2a02:2919:fcca::2 ; 30s AAAA 2a02:2919:fcca::2
vpn02 A 134.102.22.130 vpn02 30s A 134.102.22.130
vpn A 185.55.119.34 vpn 30s A 37.72.148.148
A 134.102.22.130 30s A 134.102.22.130
AAAA 2a02:2919:fcca::2 30s AAAA 2a02:2919:fcca::2
; mail ; mail
mail A 37.72.148.168 mail A 37.72.148.168
@ -50,9 +43,7 @@ wiki A 37.72.148.168
AAAA 2a02:2918:506:101::168 AAAA 2a02:2918:506:101::168
; mesh stuff ; mesh stuff
nodes NS ns01 nodes NS vpn01.bremen.freifunk.net.
nodes NS ns02
nodes NS ns03
node A 10.196.0.127 node A 10.196.0.127
AAAA fd2f:5119:f2c::127 AAAA fd2f:5119:f2c::127
@ -74,4 +65,5 @@ introducer.tahoe-lafs A 10.196.0.2
node A 10.196.0.127 node A 10.196.0.127
AAAA fd2f:5119:f2c::127 AAAA fd2f:5119:f2c::127
sip A 10.196.2.50
smokeping AAAA 2a02:2919:1000:0:ba27:ebff:fe69:2879 smokeping AAAA 2a02:2919:1000:0:ba27:ebff:fe69:2879

1
data/ffhb.de.zone Symbolic link
View File

@ -0,0 +1 @@
bremen.freifunk.net.zone

100
update-dns.sh
View File

@ -27,37 +27,26 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# TMP file # variable to check changes
TMP_CONFIG_FILE="$(mktemp)" declare -i CHANGED=0
# PID file # PID file
RUN_FILE='/run/update-dns-ffhb.run' RUN_FILE="$HOME/.var/run/ffhb-dns"
# destination zonefile directory # destination zonefile directory
DEST_DIR='/var/cache/bind' DEST_DIR="$HOME/zones"
DEST_CONFIG_FILE="${DEST_DIR}/ffhb-zones.conf"
# getting workingdir of scripts # getting workingdir of scripts
WORK_DIR="$(dirname $(readlink -nf $0))" WORK_DIR="$(dirname $(readlink -nf $0))"
# set safe path # set safe path
PATH=/sbin:/usr/sbin:/bin:/usr/bin PATH=/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin
# several sites to get IP address
GET_MY_IP=( "http://getip.planetcyb.org" "http://whatismyip.oceanus.ro" "http://www.whatismyip.us" "http://whatismyip.everdot.org" "http://www.whatismyip.ca" "http://whatismyip.com.au" "http://www.whatismyip.nl" "http://www.whatismyip.ro" "http://www.whatismyip.se" )
EXTERNAL_IPV4_ADDR=''
EXTERNAL_IPV6_ADDR="$(perl -MNetAddr::IP -MNet::Address::IP::Local -e "print NetAddr::IP->new6(Net::Address::IP::Local->public_ipv6)->short()" | tr '[A-Z]' '[a-z]')"
EXTERNAL_IPV6_NETWORK="$(perl -MNetAddr::IP -e "print NetAddr::IP->new6('${EXTERNAL_IPV6_ADDR}/64')->network->short()" | tr '[A-Z]' '[a-z]' | sed -e 's/::$//g')"
function on_exit() { function on_exit() {
# remove tmp files # remove tmp files
for FILE in "$RUN_FILE" "$TMP_CONFIG_FILE"; do if [ -n "$RUN_FILE" ]; then
if [ -n "$FILE" ]; then rm -f "$RUN_FILE"
rm -f "$FILE"
fi fi
done
} }
trap on_exit EXIT SIGTERM SIGINT trap on_exit EXIT SIGTERM SIGINT
@ -67,24 +56,10 @@ if [ -f "$RUN_FILE" ]; then
echo 'Script already running!' >&2 echo 'Script already running!' >&2
exit 1 exit 1
else else
mkdir -p "$(dirname $RUN_FILE)"
touch "$RUN_FILE" touch "$RUN_FILE"
fi fi
# get IPv4 address
for URL in "${GET_MY_IP[@]}"; do
EXTERNAL_IPV4_ADDR="$(curl -m4 -4 -s -- ${URL} | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | head -n1)"
if [ -n "$EXTERNAL_IPV4_ADDR" ]; then
break
fi
done
# print error if determining of IP addresses failed
if [ -z "$EXTERNAL_IPV4_ADDR" -o -z "$EXTERNAL_IPV6_ADDR" ]; then
echo 'Determining of IP address failed!' >&2
exit 1
fi
# refresh git repository # refresh git repository
git --work-tree="${WORK_DIR}" --git-dir="${WORK_DIR}/.git" pull -q --rebase=false origin master git --work-tree="${WORK_DIR}" --git-dir="${WORK_DIR}/.git" pull -q --rebase=false origin master
@ -98,48 +73,23 @@ for FILE in ${WORK_DIR}/data/*; do
NEW_SERIAL='' NEW_SERIAL=''
# construct realname # construct realname
REAL_NAME="$(basename $FILE)" FILE_NAME="$(basename $FILE)"
# construct origin # construct origin
ORIGIN="$(basename "${FILE/.zone/}")" ORIGIN="$(basename "${FILE/.zone/}")"
# build zone name from filename cp "$FILE" "$TMP_FILE"
declare -a DOMAIN_PARTS
IFS='.' read -a DOMAIN_PARTS <<< "$ORIGIN"
DOMAIN=''
for (( idx=${#DOMAIN_PARTS[@]}-1 ; idx>=0 ; idx-- )) ; do
[ -n "$DOMAIN" ] && DOMAIN="$DOMAIN.${DOMAIN_PARTS[idx]}" || DOMAIN="${DOMAIN_PARTS[idx]}"
done
# replace the first dash with a slash
# for RDNS zones smaller than /24
if [ $(grep -o '-' <<<"$DOMAIN" | wc -l) -gt 1 ]; then
DOMAIN="$(sed -e 's#-#/#' <<< $DOMAIN)"
fi
# write new config entry
cat >> "$TMP_CONFIG_FILE" <<EOF
zone "$DOMAIN" {
type master;
file "${DEST_DIR}/${REAL_NAME}";
allow-query { any; };
notify yes;
};
EOF
# replace placeholder with real ip adresses
sed -e "s/___EXTERNAL-IPV4-ADDR___/${EXTERNAL_IPV4_ADDR}/g" -e "s/___EXTERNAL-IPV6-ADDR___/${EXTERNAL_IPV6_ADDR}/g" -e "s/___EXTERNAL-IPV6-NETWORK___/${EXTERNAL_IPV6_NETWORK}/g" "$FILE" >"$TMP_FILE"
# if zone already exists # if zone already exists
if [ -f "${DEST_DIR}/${REAL_NAME}" ]; then if [ -f "${DEST_DIR}/${FILE_NAME}" ]; then
# save old serial number # save old serial number
OLD_SERIAL="$(grep -Eho "20[0-1][0-9]{7}" "${DEST_DIR}/${REAL_NAME}")" OLD_SERIAL="$(grep -Eho "20[0-1][0-9]{7}" "${DEST_DIR}/${FILE_NAME}")"
# strip serial from old and new files # strip serial from old and new files
# diff is easier without different serial numbers # diff is easier without different serial numbers
TMP_FILE_OLD="$(mktemp)" TMP_FILE_OLD="$(mktemp)"
TMP_FILE_NEW="$(mktemp)" TMP_FILE_NEW="$(mktemp)"
sed -e '/20[0-1][0-9]\{7\}/d' "${DEST_DIR}/${REAL_NAME}" >"$TMP_FILE_OLD" sed -e '/20[0-1][0-9]\{7\}/d' "${DEST_DIR}/${FILE_NAME}" >"$TMP_FILE_OLD"
sed -e '/20[0-1][0-9]\{7\}/d' "$TMP_FILE" >"$TMP_FILE_NEW" sed -e '/20[0-1][0-9]\{7\}/d' "$TMP_FILE" >"$TMP_FILE_NEW"
# check if update is necessary # check if update is necessary
@ -155,16 +105,8 @@ EOF
fi fi
fi fi
# check if zone is valid # changed variable
if ! named-checkzone "$DOMAIN" "$TMP_FILE" >/dev/null 2>&1; then CHANGED=1
echo "$FILE is not valid!" >&2
for FILE in "$TMP_FILE" "$TMP_FILE_OLD" "$TMP_FILE_NEW"; do
if [ -n "$FILE" ]; then
rm -f "$FILE"
fi
done
continue
fi
# update serial # update serial
if [ -n "$OLD_SERIAL" ]; then if [ -n "$OLD_SERIAL" ]; then
@ -175,16 +117,12 @@ EOF
sed -e 's/20[0-1][0-9]\{7\}/'${NEW_SERIAL}'/g' -i "$TMP_FILE" sed -e 's/20[0-1][0-9]\{7\}/'${NEW_SERIAL}'/g' -i "$TMP_FILE"
# move the file to real place # move the file to real place
mv "$TMP_FILE" "${DEST_DIR}/${REAL_NAME}" mv "$TMP_FILE" "${DEST_DIR}/${FILE_NAME}"
# fix permissions # fix permissions
chmod 0644 "${DEST_DIR}/${REAL_NAME}" chmod 0644 "${DEST_DIR}/${FILE_NAME}"
done done
if [ ! -f "$DEST_CONFIG_FILE" ] || ( [ -n "$(cat $TMP_CONFIG_FILE)" ] && ! diff -q "$TMP_CONFIG_FILE" "$DEST_CONFIG_FILE" >/dev/null 2>&1 ); then if [ $CHANGED -ne 0 ]; then
mv "$TMP_CONFIG_FILE" "$DEST_CONFIG_FILE" planetcyborg-dns-reload
chmod 0644 "$DEST_CONFIG_FILE"
fi fi
# reload nameserver
rndc reload >/dev/null