From 1bdee42ff1945dd631db725acf3d03b8a36f6a48 Mon Sep 17 00:00:00 2001 From: Robin Geuze Date: Tue, 17 Mar 2020 16:33:43 +0100 Subject: [PATCH] Retab backends/bind-master and backends/gsql-common to prevent annoying indenting issues --- regression-tests/backends/bind-master | 148 +++++++++++++------------- regression-tests/backends/gsql-common | 110 +++++++++---------- 2 files changed, 129 insertions(+), 129 deletions(-) diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master index 141310f4da..54b2f96906 100644 --- a/regression-tests/backends/bind-master +++ b/regression-tests/backends/bind-master @@ -1,42 +1,42 @@ case $context in - bind) - cat > pdns-bind.conf << __EOF__ + bind) + cat > pdns-bind.conf << __EOF__ module-dir=./modules launch=bind bind-config=./named.conf bind-ignore-broken-records=yes __EOF__ - $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \ - --config-name=bind --socket-dir=./ --no-shuffle \ - --cache-ttl=$cachettl --dname-processing \ - --disable-axfr-rectify=yes & - skipreasons="nodnssec nodyndns nometa noalias" - bindwait bind - ;; + $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \ + --config-name=bind --socket-dir=./ --no-shuffle \ + --cache-ttl=$cachettl --dname-processing \ + --disable-axfr-rectify=yes & + skipreasons="nodnssec nodyndns nometa noalias" + bindwait bind + ;; - bind-dnssec | bind-dnssec-nsec3 | bind-hybrid-nsec3 | bind-dnssec-nsec3-optout | bind-dnssec-nsec3-narrow) - rm -f dnssec.sqlite3 - cat > pdns-bind.conf << __EOF__ + bind-dnssec | bind-dnssec-nsec3 | bind-hybrid-nsec3 | bind-dnssec-nsec3-optout | bind-dnssec-nsec3-narrow) + rm -f dnssec.sqlite3 + cat > pdns-bind.conf << __EOF__ module-dir=./modules launch=bind bind-config=./named.conf bind-ignore-broken-records=yes __EOF__ - if [ $context = bind-hybrid-nsec3 ] - then - [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest - [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root - [ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost - [ -z "$GMYSQLPASSWD" ] && GMYSQLPASSWD='' + if [ $context = bind-hybrid-nsec3 ] + then + [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest + [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root + [ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost + [ -z "$GMYSQLPASSWD" ] && GMYSQLPASSWD='' - mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" --force drop "$GMYSQLDB" \ - || echo ignoring mysqladmin drop failure - mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" create "$GMYSQLDB" - mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" < ../modules/gmysqlbackend/schema.mysql.sql + mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" --force drop "$GMYSQLDB" \ + || echo ignoring mysqladmin drop failure + mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" create "$GMYSQLDB" + mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ + "$GMYSQLDB" < ../modules/gmysqlbackend/schema.mysql.sql - cat >> pdns-bind.conf << __EOF__ + cat >> pdns-bind.conf << __EOF__ bind-hybrid launch+=gmysql gmysql-dbname=$GMYSQLDB @@ -45,71 +45,71 @@ gmysql-host=$GMYSQLHOST gmysql-password=$GMYSQLPASSWD gmysql-dnssec __EOF__ - else - echo "bind-dnssec-db=./dnssec.sqlite3" >> pdns-bind.conf - $PDNSUTIL --config-dir=. --config-name=bind create-bind-db dnssec.sqlite3 - fi + else + echo "bind-dnssec-db=./dnssec.sqlite3" >> pdns-bind.conf + $PDNSUTIL --config-dir=. --config-name=bind create-bind-db dnssec.sqlite3 + fi - for zone in $(grep 'zone ' named.conf | cut -f2 -d\") - do - if [ $context = bind-hybrid-nsec3 ] - then - mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" -e "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')" - fi - if [ $zone != insecure.dnssec-parent.com ] - then + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + if [ $context = bind-hybrid-nsec3 ] + then + mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ + "$GMYSQLDB" -e "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')" + fi + if [ $zone != insecure.dnssec-parent.com ] + then securezone $zone bind if [ $zone = hiddencryptokeys.org ] then keyid=$($PDNSUTIL --config-dir=. --config-name=bind list-keys $zone | grep hiddencryptokeys.org | awk '{ print $5 }') $PDNSUTIL --config-dir=. --config-name=bind unpublish-zone-key $zone $keyid fi - if [ $context = bind-dnssec-nsec3 ] || [ $context = bind-dnssec-nsec3-optout ] || [ $context = bind-hybrid-nsec3 ] - then - $PDNSUTIL --config-dir=. --config-name=bind set-nsec3 $zone "1 $optout 1 abcd" 2>&1 - elif [ $context = bind-dnssec-nsec3-narrow ] - then - $PDNSUTIL --config-dir=. --config-name=bind set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 - fi + if [ $context = bind-dnssec-nsec3 ] || [ $context = bind-dnssec-nsec3-optout ] || [ $context = bind-hybrid-nsec3 ] + then + $PDNSUTIL --config-dir=. --config-name=bind set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + elif [ $context = bind-dnssec-nsec3-narrow ] + then + $PDNSUTIL --config-dir=. --config-name=bind set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 + fi if [ $zone = cryptokeys.org ] then $PDNSUTIL --config-dir=. --config-name=bind add-zone-key $zone zsk 384 active unpublished ecdsa384 $PDNSUTIL --config-dir=. --config-name=bind add-zone-key $zone zsk 2048 inactive published rsasha512 $PDNSUTIL --config-dir=. --config-name=bind add-zone-key $zone zsk 2048 inactive unpublished rsasha256 fi - fi - if [ "$zone" = "tsig.com" ]; then - $PDNSUTIL --config-dir=. --config-name=bind import-tsig-key test $ALGORITHM $KEY - $PDNSUTIL --config-dir=. --config-name=bind activate-tsig-key tsig.com test master - fi - done + fi + if [ "$zone" = "tsig.com" ]; then + $PDNSUTIL --config-dir=. --config-name=bind import-tsig-key test $ALGORITHM $KEY + $PDNSUTIL --config-dir=. --config-name=bind activate-tsig-key tsig.com test master + fi + done - if [ $context = bind-dnssec-nsec3 ] || [ $context = bind-hybrid-nsec3 ] - then - extracontexts="bind dnssec nsec3" - skipreasons="nsec3 nodyndns noalias" - elif [ $context = bind-dnssec-nsec3-optout ] - then - extracontexts="bind dnssec nsec3 nsec3-optout" - skipreasons="optout nodyndns noalias" - elif [ $context = bind-dnssec-nsec3-narrow ] - then - extracontexts="bind dnssec narrow" - skipreasons="narrow nodyndns noalias" - else - extracontexts="bind dnssec" - skipreasons="nodyndns noalias nsec" - fi + if [ $context = bind-dnssec-nsec3 ] || [ $context = bind-hybrid-nsec3 ] + then + extracontexts="bind dnssec nsec3" + skipreasons="nsec3 nodyndns noalias" + elif [ $context = bind-dnssec-nsec3-optout ] + then + extracontexts="bind dnssec nsec3 nsec3-optout" + skipreasons="optout nodyndns noalias" + elif [ $context = bind-dnssec-nsec3-narrow ] + then + extracontexts="bind dnssec narrow" + skipreasons="narrow nodyndns noalias" + else + extracontexts="bind dnssec" + skipreasons="nodyndns noalias nsec" + fi - $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \ - --config-name=bind --socket-dir=./ --no-shuffle \ - --cache-ttl=$cachettl --dname-processing \ - --disable-axfr-rectify=yes $lua_prequery & + $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \ + --config-name=bind --socket-dir=./ --no-shuffle \ + --cache-ttl=$cachettl --dname-processing \ + --disable-axfr-rectify=yes $lua_prequery & - bindwait bind - ;; + bindwait bind + ;; - *) - nocontext=yes + *) + nocontext=yes esac diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common index 48903ecff7..9a9b527c6a 100644 --- a/regression-tests/backends/gsql-common +++ b/regression-tests/backends/gsql-common @@ -1,30 +1,30 @@ gsql_master() { - backend=$1 - skipreasons=$2 + backend=$1 + skipreasons=$2 - real_backend=$backend - if `echo $backend | grep -q '_'`; then - real_backend=$(echo $backend | awk -F '_' '{print $1}') - fi + real_backend=$backend + if `echo $backend | grep -q '_'`; then + real_backend=$(echo $backend | awk -F '_' '{print $1}') + fi - if [ $context != ${backend}-nodnssec ] - then - echo "${real_backend}-dnssec" >> pdns-${backend}.conf - fi + if [ $context != ${backend}-nodnssec ] + then + echo "${real_backend}-dnssec" >> pdns-${backend}.conf + fi - for zone in $(grep 'zone ' named.conf | cut -f2 -d\") - do - if [ $context != ${backend}-nodnssec ] && [ $zone != insecure.dnssec-parent.com ] - then - if [ $context = ${backend}-nsec3 ] || [ $context = ${backend}-nsec3-optout ] - then - $PDNSUTIL --config-dir=. --config-name=$backend set-nsec3 $zone "1 $optout 1 abcd" 2>&1 - elif [ $context = ${backend}-nsec3-narrow ] - then - $PDNSUTIL --config-dir=. --config-name=$backend set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 - fi - securezone $zone ${backend} + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + if [ $context != ${backend}-nodnssec ] && [ $zone != insecure.dnssec-parent.com ] + then + if [ $context = ${backend}-nsec3 ] || [ $context = ${backend}-nsec3-optout ] + then + $PDNSUTIL --config-dir=. --config-name=$backend set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + elif [ $context = ${backend}-nsec3-narrow ] + then + $PDNSUTIL --config-dir=. --config-name=$backend set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 + fi + securezone $zone ${backend} if [ $zone = hiddencryptokeys.org ] then keyid=$($PDNSUTIL --config-dir=. --config-name=$backend list-keys $zone | grep hiddencryptokeys.org | awk '{ print $5 }') @@ -36,40 +36,40 @@ gsql_master() $PDNSUTIL --config-dir=. --config-name=$backend add-zone-key $zone zsk 2048 inactive published rsasha512 $PDNSUTIL --config-dir=. --config-name=$backend add-zone-key $zone zsk 2048 inactive unpublished rsasha256 fi - else - $PDNSUTIL --config-dir=. --config-name=$backend rectify-zone $zone 2>&1 - fi - if [ "$zone" = "tsig.com" ]; then - $PDNSUTIL --config-dir=. --config-name=$backend import-tsig-key test $ALGORITHM $KEY - $PDNSUTIL --config-dir=. --config-name=$backend activate-tsig-key tsig.com test master - fi - done + else + $PDNSUTIL --config-dir=. --config-name=$backend rectify-zone $zone 2>&1 + fi + if [ "$zone" = "tsig.com" ]; then + $PDNSUTIL --config-dir=. --config-name=$backend import-tsig-key test $ALGORITHM $KEY + $PDNSUTIL --config-dir=. --config-name=$backend activate-tsig-key tsig.com test master + fi + done - $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \ - --config-name=$backend --socket-dir=./ --no-shuffle \ - --dnsupdate=yes --resolver=$RESOLVERIP --outgoing-axfr-expand-alias=yes \ - --expand-alias=yes \ - --cache-ttl=$cachettl --dname-processing \ - --disable-axfr-rectify=yes $lua_prequery & + $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \ + --config-name=$backend --socket-dir=./ --no-shuffle \ + --dnsupdate=yes --resolver=$RESOLVERIP --outgoing-axfr-expand-alias=yes \ + --expand-alias=yes \ + --cache-ttl=$cachettl --dname-processing \ + --disable-axfr-rectify=yes $lua_prequery & - if [ $context = ${backend}-nsec3 ] - then - extracontexts="dnssec nsec3" - skipreasons="$skipreasons nsec3" - elif [ $context = ${backend}-nsec3-optout ] - then - extracontexts="dnssec nsec3 nsec3-optout" - skipreasons="$skipreasons optout" - elif [ $context = ${backend}-nsec3-narrow ] - then - extracontexts="dnssec narrow" - skipreasons="$skipreasons narrow" - elif [ $context = ${backend}-nodnssec ] - then - skipreasons="$skipreasons nodnssec" - else - extracontexts="dnssec" - skipreasons="$skipreasons nsec" - fi + if [ $context = ${backend}-nsec3 ] + then + extracontexts="dnssec nsec3" + skipreasons="$skipreasons nsec3" + elif [ $context = ${backend}-nsec3-optout ] + then + extracontexts="dnssec nsec3 nsec3-optout" + skipreasons="$skipreasons optout" + elif [ $context = ${backend}-nsec3-narrow ] + then + extracontexts="dnssec narrow" + skipreasons="$skipreasons narrow" + elif [ $context = ${backend}-nodnssec ] + then + skipreasons="$skipreasons nodnssec" + else + extracontexts="dnssec" + skipreasons="$skipreasons nsec" + fi } -- 2.47.2