Faidon Liambotis has submitted this change and it was merged.
Change subject: authdns: remove 1.x check from local-update/lint
......................................................................
authdns: remove 1.x check from local-update/lint
authdns-local-update and, less importantly, authdns-lint, have guards
for gdnsd 1.x. This, however, is broken on newly provisioned DNS servers
as there is a catch-22: the initial "authdns-local-update" is triggered
from puppet with a before => Package['gdnsd'] and the non-existence of
the package breaks the check. Since 1.x is quite old by now and wouldn't
show up in our infrastructure, remove the check entirely.
Also while at it, add an "mkdir -p /var/lib/gdnsd" to fix another
provisioning failure. This will, however, be moved into the packages on
the next release and soon become redundant.
Change-Id: I7cb7ac204d59773fb03285de7c19aa8f989c2df7
---
M modules/authdns/files/authdns-lint
M modules/authdns/files/authdns-local-update
2 files changed, 1 insertion(+), 6 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/authdns/files/authdns-lint
b/modules/authdns/files/authdns-lint
index b2e08a4..2733cd1 100644
--- a/modules/authdns/files/authdns-lint
+++ b/modules/authdns/files/authdns-lint
@@ -22,9 +22,6 @@
WORKINGDIR=$1
TESTDIR=$2
-# 1.x and 2.x have different path-related flags...
-(gdnsd -h 2>&1 | grep -q 'gdnsd version 2') || die "This script only supports
gdnsd 2.x"
-
if [ -z "$WORKINGDIR" ]; then
die "no template dir specified"
fi
diff --git a/modules/authdns/files/authdns-local-update
b/modules/authdns/files/authdns-local-update
index c0607f6..230b2ad 100644
--- a/modules/authdns/files/authdns-local-update
+++ b/modules/authdns/files/authdns-local-update
@@ -20,9 +20,6 @@
die "this script needs root"
fi
-# 1.x and 2.x have differences
-(gdnsd -h 2>&1 | grep -q 'gdnsd version 2') || die "This script only supports
gdnsd 2.x"
-
# setup locking; only one copy of this may be running at the same time
LOCKFILE=/var/lock/authdns-local-update
LOCKFD=9
@@ -105,6 +102,7 @@
fi
echo "Copying admin_state into place; will take effect immediately"
+mkdir -p /var/lib/gdnsd
cp -f $WORKINGDIR/admin_state /var/lib/gdnsd/
### reload
--
To view, visit https://gerrit.wikimedia.org/r/210889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cb7ac204d59773fb03285de7c19aa8f989c2df7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
