updated ascension-bind with logic when no zones are defined

10 files changed, 72 insertions, 10 deletions

diff --git a/deb_dist/ascension-0.6.1/ascension/ascension.py b/deb_dist/ascension-0.6.1/ascension/ascension.py
index 9171f0a..1c958b8 100644
--- 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
index 899ec41..a989c5b 100644
--- 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
index c10bcb1..d799377 100644
--- 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
index e507074..663db50 100644
--- 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
index c9ab70b..b2f13ec 100755
--- 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
index 0f8785b..3c75c97 100755
--- 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
index 91dcb61..3076199 100755
--- 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
index e04c2d7..bbc1d48 100644
--- 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
diff --git a/deb_dist/ascension-0.6.1/debian/rules b/deb_dist/ascension-0.6.1/debian/rules
index 171dfd4..3d64a6e 100755
--- 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
index e98613c..028fc5d 100644
--- a/deb_dist/python3-ascension_0.6.1-1_all.deb
+++ b/deb_dist/python3-ascension_0.6.1-1_all.deb