commit 685c1592c6c4ab267d7dcd2def8320e3c4f4a02c parent 8de9104f51def18d2a0cb5c64b67afc76863ff40 Author: rexxnor <rexxnor+gnunet@brief.li> Date: Wed, 15 May 2019 16:24:35 +0200 updated ascension-bind with logic when no zones are defined Diffstat:
21 files changed, 121 insertions(+), 64 deletions(-)
diff --git a/ascension/ascension.py b/ascension/ascension.py @@ -263,8 +263,8 @@ class Ascender(): # add recordline to gns and filter out empty lines if len(recordline) > 1: self.add_recordline_to_gns(recordline, - domain, - label) + domain, + label) taskqueue.task_done() # End of worker diff --git a/deb_dist/ascension-0.6.1/ascension/ascension.py b/deb_dist/ascension-0.6.1/ascension/ascension.py @@ -263,8 +263,8 @@ class Ascender(): # add recordline to gns and filter out empty lines if len(recordline) > 1: self.add_recordline_to_gns(recordline, - domain, - label) + domain, + label) taskqueue.task_done() # End of worker diff --git a/deb_dist/ascension-0.6.1/debian/changelog b/deb_dist/ascension-0.6.1/debian/changelog @@ -2,4 +2,4 @@ ascension (0.6.1-1) unstable; urgency=low * source package automatically created by stdeb 0.8.5 - -- rexxnor <rexxnor+gnunet@brief.li> Mon, 13 May 2019 07:43:23 +0000 + -- rexxnor <rexxnor+gnunet@brief.li> Tue, 14 May 2019 18:22:41 +0000 diff --git a/deb_dist/ascension-0.6.1/debian/python3-ascension/DEBIAN/control b/deb_dist/ascension-0.6.1/debian/python3-ascension/DEBIAN/control @@ -3,7 +3,7 @@ Source: ascension Version: 0.6.1-1 Architecture: all Maintainer: rexxnor <rexxnor+gnunet@brief.li> -Installed-Size: 58 +Installed-Size: 59 Depends: python3-coverage, python3-dnspython, python3-docopt, python3-mock, python3-pbr, python3-six, python3:any (>= 3.3.2-2~) Section: python Priority: optional diff --git a/deb_dist/ascension-0.6.1/debian/python3-ascension/DEBIAN/md5sums b/deb_dist/ascension-0.6.1/debian/python3-ascension/DEBIAN/md5sums @@ -1,10 +1,10 @@ -e39447d26076db60f6e3af5fcc58d379 usr/bin/ascension +d7291d8f65af903efd61ce477a27e75c usr/bin/ascension 9a1cca110e94552f9190fb1b0e3e5dad usr/lib/python3/dist-packages/ascension-0.6.1.egg-info/PKG-INFO 68b329da9893e34099c7d8ad5cb9c940 usr/lib/python3/dist-packages/ascension-0.6.1.egg-info/dependency_links.txt 9cda1022e5fc72a3762b4bc09ee0ddb5 usr/lib/python3/dist-packages/ascension-0.6.1.egg-info/entry_points.txt d41d8cd98f00b204e9800998ecf8427e usr/lib/python3/dist-packages/ascension-0.6.1.egg-info/requires.txt e616e4373e7b199db038fd8e938a3188 usr/lib/python3/dist-packages/ascension-0.6.1.egg-info/top_level.txt d41d8cd98f00b204e9800998ecf8427e usr/lib/python3/dist-packages/ascension/__init__.py -9777716be2527b7b901fd7df0b5aa08c usr/lib/python3/dist-packages/ascension/ascension.py +cd04f823990fce0788900abba1c25625 usr/lib/python3/dist-packages/ascension/ascension.py 3211ad0ee8099a5512e496e8a4a39816 usr/man/man1/ascension.1 -d2cd8d642d8b1f56a64985ad3128351b usr/share/doc/python3-ascension/changelog.Debian.gz +dc20081e00c1968923adb86cec906569 usr/share/doc/python3-ascension/changelog.Debian.gz diff --git a/deb_dist/ascension-0.6.1/debian/python3-ascension/DEBIAN/postinst b/deb_dist/ascension-0.6.1/debian/python3-ascension/DEBIAN/postinst @@ -1,9 +1,51 @@ #!/bin/sh +# postinst script for ascension-bind +# +# see: dh_installdeb(1) +# load debconf library set -e +if ! id ascension; then + adduser --system ascension +fi +# ok if this fails as gnunet is not yet a dependency +if ! id gnunet; then + addgroup --system gnunet + adduser ascension gnunet +fi + +mkdir -p /etc/ascension.d/ + +# add systemd unit file + cat > "/etc/ascension.d/gnunet-ascension.service" << EOF +[Unit] +Description=Starting GNUnet peer for ascension +After=network.target + +[Service] +Type=oneshot +RemainAfterExit=yes +User=ascension +ExecStart=/usr/bin/gnunet-arm -s +ExecStop=/usr/bin/gnunet-arm -e +ExecReload=/usr/bin/gnunet-arm -r + +[Install] +WantedBy=multi-user.target +EOF + +# link the systemd unit file +ln -sf "/etc/ascension.d/gnunet-ascension.service" "/lib/systemd/system/gnunet-ascension.service" + +# start and enable service +deb-systemd-invoke start gnunet-ascension +deb-systemd-invoke enable gnunet-ascension + + # Automatically added by dh_python3: if which py3compile >/dev/null 2>&1; then py3compile -p python3-ascension fi # End automatically added section + diff --git a/deb_dist/ascension-0.6.1/debian/python3-ascension/DEBIAN/prerm b/deb_dist/ascension-0.6.1/debian/python3-ascension/DEBIAN/prerm @@ -1,6 +1,25 @@ #!/bin/sh +# prerm script for ascension-bind +# +# see: dh_installdeb(1) +# load debconf library set -e +mkdir -p /etc/ascension.d/ + +# remove systemd stuff +deb-systemd-invoke disable gnunet-ascension +deb-systemd-invoke stop gnunet-ascension + +# remove the systemd files +unlink /lib/systemd/system/gnunet-ascension.service +rm /etc/ascension.d/gnunet-ascension.service + +# link the systemd unit file +deb-systemd-invoke daemon-reload + +exit 0 + # Automatically added by dh_python3: if which py3clean >/dev/null 2>&1; then py3clean -p python3-ascension @@ -10,3 +29,4 @@ else fi # End automatically added section + diff --git a/deb_dist/ascension-0.6.1/debian/python3-ascension/usr/bin/ascension b/deb_dist/ascension-0.6.1/debian/python3-ascension/usr/bin/ascension @@ -1,4 +1,4 @@ -#! /usr/bin/python3 +#!/usr/bin/python3 # EASY-INSTALL-ENTRY-SCRIPT: 'ascension==0.6.1','console_scripts','ascension' __requires__ = 'ascension==0.6.1' import re diff --git a/deb_dist/ascension-0.6.1/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz b/deb_dist/ascension-0.6.1/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz Binary files differ. diff --git a/deb_dist/ascension-0.6.1/debian/rules b/deb_dist/ascension-0.6.1/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # This file was automatically generated by stdeb 0.8.5 at -# Mon, 13 May 2019 07:43:23 +0000 +# Tue, 14 May 2019 18:22:41 +0000 %: dh $@ --with python3 --buildsystem=python_distutils @@ -19,7 +19,7 @@ override_dh_auto_build: override_dh_auto_install: - python3 setup.py install --force --root=debian/python3-ascension --no-compile -O0 --install-layout=deb --prefix=/usr + python3 setup.py install --force --root=debian/python3-ascension --no-compile -O0 --install-layout=deb diff --git a/deb_dist/python3-ascension_0.6.1-1_all.deb b/deb_dist/python3-ascension_0.6.1-1_all.deb Binary files differ. diff --git a/debian/ascension-bind-0.0.1/debian/ascension-bind.config b/debian/ascension-bind-0.0.1/debian/ascension-bind.config @@ -16,6 +16,11 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } zonelist=$(grep "^zone" < /etc/bind/named.conf.local | grep -vE "(arpa|localhost|\"\.\")" | cut -d '"' -f2) zonelist=$(echo "$zonelist" | sed 's/\n/ /g' | sed 's/ /, /g') +if [ -z "$zonelist" ]; then + echo "There are no zones to migrate" + exit 0 +fi + #altzonelist=$(named-checkconf -z | grep -P "\d{4,}$") #altzones=("$altzonelist") @@ -42,6 +47,7 @@ db_go || true db_get ascension-bind/zones echo "$RET" | sed 's/ //g' | sed 's/,/\n/g' > selectedzones readarray zones < selectedzones +rm selectedzones db_fset ascension-bind/publishing seen false db_input medium ascension-bind/publishing || true @@ -52,9 +58,7 @@ zonestatus=true for ZONE in "${zones[@]}" do ZONE=$( echo "$ZONE" | tr -d '\n') - su -s /bin/bash ascension << EOF -ascension "$ZONE" -n localhost --dry-run -EOF + ascension "$ZONE" -n localhost --dry-run if [ $? -gt 0 ]; then zonestatus=false break @@ -126,18 +130,14 @@ EOF ln -sf "/etc/ascension.d/ascension-bind-$FILECONV.service" "/lib/systemd/system/ascension-bind-$FILECONV.service" done -deb-systemd-invoke daemon-reload for ZONE in "${zones[@]}" do ZONE=$( echo "$ZONE" | tr -d '\n') - ZONE=$( echo "$ZONE" | tr '.' '_') + FILECONV=$( echo "$ZONE" | tr '.' '_') echo "Starting and enabling ascension-bind-$FILECONV" deb-systemd-invoke start "ascension-bind-$FILECONV" deb-systemd-invoke enable "ascension-bind-$FILECONV" - #deb-systemd-invoke start "ascension-bind-$ZONE" - #deb-systemd-invoke enable "ascension-bind-$ZONE" done -deb-systemd-invoke daemon-reload exit 0 #DEBHELPER# diff --git a/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/config b/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/config @@ -15,7 +15,12 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } #read -r zones < installedzones zonelist=$(grep "^zone" < /etc/bind/named.conf.local | grep -vE "(arpa|localhost|\"\.\")" | cut -d '"' -f2) -zonelist=$(echo $zonelist | sed 's/\n/ /g' | sed 's/ /, /g') +zonelist=$(echo "$zonelist" | sed 's/\n/ /g' | sed 's/ /, /g') +if [ -z "$zonelist" ]; then + echo "There are no zones to migrate" + exit 0 +fi + #altzonelist=$(named-checkconf -z | grep -P "\d{4,}$") #altzones=("$altzonelist") @@ -42,6 +47,7 @@ db_go || true db_get ascension-bind/zones echo "$RET" | sed 's/ //g' | sed 's/,/\n/g' > selectedzones readarray zones < selectedzones +rm selectedzones db_fset ascension-bind/publishing seen false db_input medium ascension-bind/publishing || true @@ -52,9 +58,7 @@ zonestatus=true for ZONE in "${zones[@]}" do ZONE=$( echo "$ZONE" | tr -d '\n') - su -s /bin/bash ascension << EOF -ascension "$ZONE" -n localhost --dry-run -EOF + ascension "$ZONE" -n localhost --dry-run if [ $? -gt 0 ]; then zonestatus=false break @@ -71,7 +75,7 @@ if ! $zonestatus; then else echo "Trying to allow zone transfer on localhost in global configuration" sed -i.backup -r 's|(^[^\n\S]*options\s?\{)|\1 allow\-transfer { localhost; }; |g' /etc/bind/named.conf.options - systemctl restart bind9 + deb-systemd-invoke restart bind9 zonestatus=true for ZONE in "${zones[@]}" do @@ -126,18 +130,14 @@ EOF ln -sf "/etc/ascension.d/ascension-bind-$FILECONV.service" "/lib/systemd/system/ascension-bind-$FILECONV.service" done -deb-systemd-invoke daemon-reload for ZONE in "${zones[@]}" do ZONE=$( echo "$ZONE" | tr -d '\n') - ZONE=$( echo "$ZONE" | tr '.' '_') + FILECONV=$( echo "$ZONE" | tr '.' '_') echo "Starting and enabling ascension-bind-$FILECONV" deb-systemd-invoke start "ascension-bind-$FILECONV" deb-systemd-invoke enable "ascension-bind-$FILECONV" - #deb-systemd-invoke start "ascension-bind-$ZONE" - #deb-systemd-invoke enable "ascension-bind-$ZONE" done -deb-systemd-invoke daemon-reload exit 0 diff --git a/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/control b/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/control @@ -1,9 +1,9 @@ Package: ascension-bind Version: 0.0.1-1 Architecture: amd64 -Maintainer: rexxnor <rexxnor@brief.li> -Installed-Size: 17 -Depends: debconf (>= 0.5) | debconf-2.0 +Maintainer: rexxnor <rexxnor+gnunet@brief.li> +Installed-Size: 18 +Depends: debconf (>= 0.5) | debconf-2.0, python3-ascension, bind9 Section: net Priority: optional Homepage: https://git.gnunet.org/ascension.git/ diff --git a/debian/ascension-bind-0.0.1/debian/control b/debian/ascension-bind-0.0.1/debian/control @@ -1,16 +1,14 @@ Source: ascension-bind Section: net Priority: optional -Maintainer: rexxnor <rexxnor@brief.li> +Maintainer: rexxnor <rexxnor+gnunet@brief.li> Build-Depends: debhelper (>= 9), python3-ascension, bind9 Standards-Version: 3.9.8 Homepage: https://git.gnunet.org/ascension.git/ -#Vcs-Git: https://anonscm.debian.org/collab-maint/ascension-bind.git -#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ascension-bind.git Package: ascension-bind Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, python3-ascension, bind9 Description: Allows local zone transfer on bind for migration into GNS This package modifies existing bind configuration to allow zone transfer to localhost to allow the gnsmigrator package to migrate the zone into GNS. diff --git a/debian/ascension-bind_0.0.1-1.debian.tar.xz b/debian/ascension-bind_0.0.1-1.debian.tar.xz Binary files differ. diff --git a/debian/ascension-bind_0.0.1-1.dsc b/debian/ascension-bind_0.0.1-1.dsc @@ -3,7 +3,7 @@ Source: ascension-bind Binary: ascension-bind Architecture: any Version: 0.0.1-1 -Maintainer: rexxnor <rexxnor@brief.li> +Maintainer: rexxnor <rexxnor+gnunet@brief.li> Homepage: https://git.gnunet.org/ascension.git/ Standards-Version: 3.9.8 Build-Depends: debhelper (>= 9), python3-ascension, bind9 @@ -11,10 +11,10 @@ Package-List: ascension-bind deb net optional arch=any Checksums-Sha1: 0a7953cf5bf7616ff1c2171789fab736e199e769 3860 ascension-bind_0.0.1.orig.tar.xz - 6b5155ca3372492c44934aaaa511d1fb4600de77 3916 ascension-bind_0.0.1-1.debian.tar.xz + 765dd0735494ee2cdbd19182ea411f3559f9e65d 4012 ascension-bind_0.0.1-1.debian.tar.xz Checksums-Sha256: e21b0672b6d9932d03541c13e9350546542d9dd86373bf6bc78f61a1c79586b4 3860 ascension-bind_0.0.1.orig.tar.xz - e78f2137906bf781746c9dab80819e9424952e2c32ea87c64d5d0099ef79081d 3916 ascension-bind_0.0.1-1.debian.tar.xz + 765e8c34d1c3f836cfbc3e579119c9a48be5e1fff1a393aaee3fba74ab11675c 4012 ascension-bind_0.0.1-1.debian.tar.xz Files: 3e51a0f28a46eff44e0366ab9185b840 3860 ascension-bind_0.0.1.orig.tar.xz - ee9021dd6a5702694d477e09bca5a2be 3916 ascension-bind_0.0.1-1.debian.tar.xz + 48c98574d2c632f73e2d2181eea7c2e3 4012 ascension-bind_0.0.1-1.debian.tar.xz diff --git a/debian/ascension-bind_0.0.1-1_amd64.build b/debian/ascension-bind_0.0.1-1_amd64.build @@ -79,8 +79,6 @@ dpkg-genchanges: info: including full source code in upload dpkg-buildpackage: info: full upload (original source is included) Now running lintian ascension-bind_0.0.1-1_amd64.changes ... warning: the authors of lintian do not recommend running it with root privileges! -W: ascension-bind source: changelog-should-mention-nmu -W: ascension-bind source: source-nmu-has-incorrect-version-number 0.0.1-1 E: ascension-bind source: untranslatable-debconf-templates ascension-bind.templates: 4 E: ascension-bind source: untranslatable-debconf-templates ascension-bind.templates: 10 E: ascension-bind source: untranslatable-debconf-templates ascension-bind.templates: 17 @@ -88,5 +86,4 @@ E: ascension-bind source: not-using-po-debconf E: ascension-bind source: debian-rules-is-dh_make-template W: ascension-bind: empty-binary-package W: ascension-bind: maintainer-script-ignores-errors config -W: ascension-bind: maintainer-script-calls-systemctl config:74 Finished running lintian. diff --git a/debian/ascension-bind_0.0.1-1_amd64.buildinfo b/debian/ascension-bind_0.0.1-1_amd64.buildinfo @@ -4,17 +4,17 @@ Binary: ascension-bind Architecture: amd64 source Version: 0.0.1-1 Checksums-Md5: - d4406ce06c99ebabbcc22834d8fd780b 892 ascension-bind_0.0.1-1.dsc - 9156944d8b0162ac8c76efb193cec389 3846 ascension-bind_0.0.1-1_amd64.deb + 92fd9f3a35300b20e43872be5d86896a 899 ascension-bind_0.0.1-1.dsc + 8897880391c06f398a507fec5c1cc7bc 3980 ascension-bind_0.0.1-1_amd64.deb Checksums-Sha1: - 16c228c6f9458087258222bc1851cd623963d63a 892 ascension-bind_0.0.1-1.dsc - fff1c10e43a0ecd3fb0348e33f3810646fe0869b 3846 ascension-bind_0.0.1-1_amd64.deb + 3a372252001faa382de9c5c6e796b9a375c61f1f 899 ascension-bind_0.0.1-1.dsc + 2e3334062b0d082b4ffd5972d3894b205067b4cd 3980 ascension-bind_0.0.1-1_amd64.deb Checksums-Sha256: - 73455935623c505a28f4654f6999cb3caf9a706aa3c1eca819911a2fdd482f5e 892 ascension-bind_0.0.1-1.dsc - dfba7ef2ed8d0ebd5972ae7c75f9836b32237c4f33bf6a32b9a0a09053aacffc 3846 ascension-bind_0.0.1-1_amd64.deb + 3692554255a39037551378abb9f215ba4cffd320b508c554ef56ec5ffc20f14f 899 ascension-bind_0.0.1-1.dsc + 0c03a0d84dee99b1897ba218c62d84dd30616fb2332b29127aba836efc42fa4f 3980 ascension-bind_0.0.1-1_amd64.deb Build-Origin: Debian Build-Architecture: amd64 -Build-Date: Fri, 10 May 2019 12:00:26 +0000 +Build-Date: Wed, 15 May 2019 14:21:56 +0000 Installed-Build-Depends: adduser (= 3.115), autoconf (= 2.69-10), diff --git a/debian/ascension-bind_0.0.1-1_amd64.changes b/debian/ascension-bind_0.0.1-1_amd64.changes @@ -6,7 +6,7 @@ Architecture: source amd64 Version: 0.0.1-1 Distribution: UNRELEASED Urgency: low -Maintainer: rexxnor <rexxnor@brief.li> +Maintainer: rexxnor <rexxnor+gnunet@brief.li> Changed-By: rexxnor <rexxnor+gnunet@brief.li> Description: ascension-bind - Allows local zone transfer on bind for migration into GNS @@ -16,20 +16,20 @@ Changes: . * Initial release Closes: #123123 Checksums-Sha1: - 16c228c6f9458087258222bc1851cd623963d63a 892 ascension-bind_0.0.1-1.dsc + 3a372252001faa382de9c5c6e796b9a375c61f1f 899 ascension-bind_0.0.1-1.dsc 0a7953cf5bf7616ff1c2171789fab736e199e769 3860 ascension-bind_0.0.1.orig.tar.xz - 6b5155ca3372492c44934aaaa511d1fb4600de77 3916 ascension-bind_0.0.1-1.debian.tar.xz - 702b9e3ffde295c125ec590b722bc56cfdd5a750 6465 ascension-bind_0.0.1-1_amd64.buildinfo - fff1c10e43a0ecd3fb0348e33f3810646fe0869b 3846 ascension-bind_0.0.1-1_amd64.deb + 765dd0735494ee2cdbd19182ea411f3559f9e65d 4012 ascension-bind_0.0.1-1.debian.tar.xz + 302d1c4efeb01ede26026bf852fa6743f00e601a 6465 ascension-bind_0.0.1-1_amd64.buildinfo + 2e3334062b0d082b4ffd5972d3894b205067b4cd 3980 ascension-bind_0.0.1-1_amd64.deb Checksums-Sha256: - 73455935623c505a28f4654f6999cb3caf9a706aa3c1eca819911a2fdd482f5e 892 ascension-bind_0.0.1-1.dsc + 3692554255a39037551378abb9f215ba4cffd320b508c554ef56ec5ffc20f14f 899 ascension-bind_0.0.1-1.dsc e21b0672b6d9932d03541c13e9350546542d9dd86373bf6bc78f61a1c79586b4 3860 ascension-bind_0.0.1.orig.tar.xz - e78f2137906bf781746c9dab80819e9424952e2c32ea87c64d5d0099ef79081d 3916 ascension-bind_0.0.1-1.debian.tar.xz - 16e76d9f72c890130a98efc5ed7ebed135d96696d956c85fc7ea178a742c3e87 6465 ascension-bind_0.0.1-1_amd64.buildinfo - dfba7ef2ed8d0ebd5972ae7c75f9836b32237c4f33bf6a32b9a0a09053aacffc 3846 ascension-bind_0.0.1-1_amd64.deb + 765e8c34d1c3f836cfbc3e579119c9a48be5e1fff1a393aaee3fba74ab11675c 4012 ascension-bind_0.0.1-1.debian.tar.xz + 0f0da8b2755309e8838a071d886f8f5817ed2ea8ef3cb503341e8f5d76484500 6465 ascension-bind_0.0.1-1_amd64.buildinfo + 0c03a0d84dee99b1897ba218c62d84dd30616fb2332b29127aba836efc42fa4f 3980 ascension-bind_0.0.1-1_amd64.deb Files: - d4406ce06c99ebabbcc22834d8fd780b 892 net optional ascension-bind_0.0.1-1.dsc + 92fd9f3a35300b20e43872be5d86896a 899 net optional ascension-bind_0.0.1-1.dsc 3e51a0f28a46eff44e0366ab9185b840 3860 net optional ascension-bind_0.0.1.orig.tar.xz - ee9021dd6a5702694d477e09bca5a2be 3916 net optional ascension-bind_0.0.1-1.debian.tar.xz - 182e01787b6c95b1fc94d4464a6f5103 6465 net optional ascension-bind_0.0.1-1_amd64.buildinfo - 9156944d8b0162ac8c76efb193cec389 3846 net optional ascension-bind_0.0.1-1_amd64.deb + 48c98574d2c632f73e2d2181eea7c2e3 4012 net optional ascension-bind_0.0.1-1.debian.tar.xz + e2f259159b027b5544001535ba1ddea4 6465 net optional ascension-bind_0.0.1-1_amd64.buildinfo + 8897880391c06f398a507fec5c1cc7bc 3980 net optional ascension-bind_0.0.1-1_amd64.deb diff --git a/debian/ascension-bind_0.0.1-1_amd64.deb b/debian/ascension-bind_0.0.1-1_amd64.deb Binary files differ.