From: Stephen Gran <steve@lobefin.net>
Date: Sat, 14 Apr 2012 17:50:42 +0000 (+0200)
Subject: make this fail if domain !d.o
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=2283d65017b9753ff45c152ea493fd10827be12a;p=mirror%2Fdsa-wiki.git

make this fail if domain !d.o

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index 1d2ec88..777525d 100644
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -12,13 +12,13 @@ adjusted.
 
         : __handel__ && puppetd -t --environment=production
 
-        : ::client:: && apt-get update &&
+        : ::client:: me=$(hostname -f) && [ "$me" != "${me%debian.org}" ] && apt-get update &&
                 apt-get install --no-install-recommends puppet libaugeas-ruby1.8 augeas-lenses lsb-release &&
                 /etc/init.d/puppet stop &&
                 (puppetd -t || true ) &&
                 cd /var/lib/puppet/ssl/certificate_requests &&
                 echo sha256sum output: && echo &&
-                sha256sum $(hostname -f).pem &&
+                sha256sum $me.pem &&
                 echo && echo && cd /
 
 This will not overwrite anything yet, since handel has not signed the