commit 7e45cd493a9bab205b7b6ea9481b07537585f3a4
parent fda47676b5457d8e39581b80d4f68dc28dc6489a
Author: rexxnor <rexxnor+gnunet@brief.li>
Date: Fri, 10 May 2019 15:06:41 +0200
make linter and lintian happier, fixed logic errors
Diffstat:
8 files changed, 43 insertions(+), 49 deletions(-)
diff --git a/debian/ascension-bind-0.0.1/debian/ascension-bind.config b/debian/ascension-bind-0.0.1/debian/ascension-bind.config
@@ -15,7 +15,7 @@ ${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')
#altzonelist=$(named-checkconf -z | grep -P "\d{4,}$")
#altzones=("$altzonelist")
@@ -48,7 +48,6 @@ db_input medium ascension-bind/publishing || true
db_go || true
PUBLIC=$RET
-echo "Zonestatus check"
zonestatus=true
for ZONE in "${zones[@]}"
do
@@ -56,14 +55,13 @@ do
su -s /bin/bash ascension << EOF
ascension "$ZONE" -n localhost --dry-run
EOF
- if [ $? ]; then
+ if [ $? -gt 0 ]; then
zonestatus=false
- break
+ break
fi
done
-echo "After Dry Runs $zonestatus"
-if [ $zonestatus ]; then
+if ! $zonestatus; then
echo "Some zones don't allow zone transfer"
if grep allow-transfer /etc/bind/named.conf* &> /dev/null; then
db_fset ascension-bind/transfer-allowed seen false
@@ -73,7 +71,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
@@ -81,10 +79,10 @@ if [ $zonestatus ]; then
su -s /bin/bash ascension << EOF
ascension "$ZONE" -n localhost --dry-run
EOF
- if [ $? ]; then
+ if [ $? -gt 0 ]; then
zonestatus=false
break
- fi
+ fi
done
if [ -z $zonestatus ]; then
db_fset ascension-bind/transfer-allowed seen false
@@ -128,18 +126,18 @@ EOF
ln -sf "/etc/ascension.d/ascension-bind-$FILECONV.service" "/lib/systemd/system/ascension-bind-$FILECONV.service"
done
-systemctl daemon-reload
+deb-systemd-invoke daemon-reload
for ZONE in "${zones[@]}"
do
ZONE=$( echo "$ZONE" | tr -d '\n')
ZONE=$( echo "$ZONE" | tr '.' '_')
echo "Starting and enabling ascension-bind-$FILECONV"
- systemctl start "ascension-bind-$FILECONV"
- systemctl enable "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
-systemctl daemon-reload
+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
@@ -48,7 +48,6 @@ db_input medium ascension-bind/publishing || true
db_go || true
PUBLIC=$RET
-echo "Zonestatus check"
zonestatus=true
for ZONE in "${zones[@]}"
do
@@ -56,14 +55,13 @@ do
su -s /bin/bash ascension << EOF
ascension "$ZONE" -n localhost --dry-run
EOF
- if [ $? ]; then
+ if [ $? -gt 0 ]; then
zonestatus=false
- break
+ break
fi
done
-echo "After Dry Runs $zonestatus"
-if [ $zonestatus ]; then
+if ! $zonestatus; then
echo "Some zones don't allow zone transfer"
if grep allow-transfer /etc/bind/named.conf* &> /dev/null; then
db_fset ascension-bind/transfer-allowed seen false
@@ -81,10 +79,10 @@ if [ $zonestatus ]; then
su -s /bin/bash ascension << EOF
ascension "$ZONE" -n localhost --dry-run
EOF
- if [ $? ]; then
+ if [ $? -gt 0 ]; then
zonestatus=false
break
- fi
+ fi
done
if [ -z $zonestatus ]; then
db_fset ascension-bind/transfer-allowed seen false
@@ -128,18 +126,18 @@ EOF
ln -sf "/etc/ascension.d/ascension-bind-$FILECONV.service" "/lib/systemd/system/ascension-bind-$FILECONV.service"
done
-systemctl daemon-reload
+deb-systemd-invoke daemon-reload
for ZONE in "${zones[@]}"
do
ZONE=$( echo "$ZONE" | tr -d '\n')
ZONE=$( echo "$ZONE" | tr '.' '_')
echo "Starting and enabling ascension-bind-$FILECONV"
- systemctl start "ascension-bind-$FILECONV"
- systemctl enable "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
-systemctl daemon-reload
+deb-systemd-invoke daemon-reload
exit 0
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
@@ -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
- 416b3df0997a0f804b0bb4dc076d1ef8a9274710 3936 ascension-bind_0.0.1-1.debian.tar.xz
+ 6b5155ca3372492c44934aaaa511d1fb4600de77 3916 ascension-bind_0.0.1-1.debian.tar.xz
Checksums-Sha256:
e21b0672b6d9932d03541c13e9350546542d9dd86373bf6bc78f61a1c79586b4 3860 ascension-bind_0.0.1.orig.tar.xz
- 8b0515c7d9074eb40b04a90c0d73f205887e0c2120bdfdeb035eb5d6ab9d2409 3936 ascension-bind_0.0.1-1.debian.tar.xz
+ e78f2137906bf781746c9dab80819e9424952e2c32ea87c64d5d0099ef79081d 3916 ascension-bind_0.0.1-1.debian.tar.xz
Files:
3e51a0f28a46eff44e0366ab9185b840 3860 ascension-bind_0.0.1.orig.tar.xz
- 8d077e4f280dbda34c39be125b1d5900 3936 ascension-bind_0.0.1-1.debian.tar.xz
+ ee9021dd6a5702694d477e09bca5a2be 3916 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
@@ -88,7 +88,5 @@ 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:76
-W: ascension-bind: maintainer-script-calls-systemctl config:137
-W: ascension-bind: maintainer-script-calls-systemctl config:138
+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:
- 1cd405dbb5238cb73adbcbc1f7934aa1 892 ascension-bind_0.0.1-1.dsc
- 2ab648774da129cbaa63097933efda1d 3860 ascension-bind_0.0.1-1_amd64.deb
+ d4406ce06c99ebabbcc22834d8fd780b 892 ascension-bind_0.0.1-1.dsc
+ 9156944d8b0162ac8c76efb193cec389 3846 ascension-bind_0.0.1-1_amd64.deb
Checksums-Sha1:
- ea3570e6540f00095afd82c63da1ded21512967c 892 ascension-bind_0.0.1-1.dsc
- da35d390c86b3a317088a270880a45e8447f183f 3860 ascension-bind_0.0.1-1_amd64.deb
+ 16c228c6f9458087258222bc1851cd623963d63a 892 ascension-bind_0.0.1-1.dsc
+ fff1c10e43a0ecd3fb0348e33f3810646fe0869b 3846 ascension-bind_0.0.1-1_amd64.deb
Checksums-Sha256:
- 4c847c08ee89fde300888b3ac283b1c3aa43f02e61024166c146371f6b49c5a0 892 ascension-bind_0.0.1-1.dsc
- ef2f301551a56e00b4c7dcb8105eb3157c2c868e12b37f2f50d623b2b8ba6106 3860 ascension-bind_0.0.1-1_amd64.deb
+ 73455935623c505a28f4654f6999cb3caf9a706aa3c1eca819911a2fdd482f5e 892 ascension-bind_0.0.1-1.dsc
+ dfba7ef2ed8d0ebd5972ae7c75f9836b32237c4f33bf6a32b9a0a09053aacffc 3846 ascension-bind_0.0.1-1_amd64.deb
Build-Origin: Debian
Build-Architecture: amd64
-Build-Date: Fri, 10 May 2019 11:25:56 +0000
+Build-Date: Fri, 10 May 2019 12:00:26 +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
@@ -16,20 +16,20 @@ Changes:
.
* Initial release Closes: #123123
Checksums-Sha1:
- ea3570e6540f00095afd82c63da1ded21512967c 892 ascension-bind_0.0.1-1.dsc
+ 16c228c6f9458087258222bc1851cd623963d63a 892 ascension-bind_0.0.1-1.dsc
0a7953cf5bf7616ff1c2171789fab736e199e769 3860 ascension-bind_0.0.1.orig.tar.xz
- 416b3df0997a0f804b0bb4dc076d1ef8a9274710 3936 ascension-bind_0.0.1-1.debian.tar.xz
- 994f14a23560026e0b9f90e7a425f6d23301d298 6465 ascension-bind_0.0.1-1_amd64.buildinfo
- da35d390c86b3a317088a270880a45e8447f183f 3860 ascension-bind_0.0.1-1_amd64.deb
+ 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
Checksums-Sha256:
- 4c847c08ee89fde300888b3ac283b1c3aa43f02e61024166c146371f6b49c5a0 892 ascension-bind_0.0.1-1.dsc
+ 73455935623c505a28f4654f6999cb3caf9a706aa3c1eca819911a2fdd482f5e 892 ascension-bind_0.0.1-1.dsc
e21b0672b6d9932d03541c13e9350546542d9dd86373bf6bc78f61a1c79586b4 3860 ascension-bind_0.0.1.orig.tar.xz
- 8b0515c7d9074eb40b04a90c0d73f205887e0c2120bdfdeb035eb5d6ab9d2409 3936 ascension-bind_0.0.1-1.debian.tar.xz
- 62ff0e37a509a3e9f3be59957d841cdc2dcabf499a3acc28e8b9f53d32291241 6465 ascension-bind_0.0.1-1_amd64.buildinfo
- ef2f301551a56e00b4c7dcb8105eb3157c2c868e12b37f2f50d623b2b8ba6106 3860 ascension-bind_0.0.1-1_amd64.deb
+ 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
Files:
- 1cd405dbb5238cb73adbcbc1f7934aa1 892 net optional ascension-bind_0.0.1-1.dsc
+ d4406ce06c99ebabbcc22834d8fd780b 892 net optional ascension-bind_0.0.1-1.dsc
3e51a0f28a46eff44e0366ab9185b840 3860 net optional ascension-bind_0.0.1.orig.tar.xz
- 8d077e4f280dbda34c39be125b1d5900 3936 net optional ascension-bind_0.0.1-1.debian.tar.xz
- 54956f983bd1338de3f6ace73df51d6a 6465 net optional ascension-bind_0.0.1-1_amd64.buildinfo
- 2ab648774da129cbaa63097933efda1d 3860 net optional ascension-bind_0.0.1-1_amd64.deb
+ 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
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.
