the part about symlinks is really not needed

[mirror/dsa-wiki.git] / input / howto / puppet-setup.mdwn

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index 1d2ec88..f96c5f9 100644 (file)
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -10,15 +10,15 @@ Make sure you have set up the IP address for the new machine in ud-ldap.
 After that run puppet on puppetmaster once, so the ferm config get
 adjusted.
 
 After that run puppet on puppetmaster once, so the ferm config get
 adjusted.
 

-        : __handel__ && puppetd -t --environment=production
+        : __handel__ && puppet agent -t --environment=production

 
 

-        : ::client:: && apt-get update &&
-                apt-get install --no-install-recommends puppet libaugeas-ruby1.8 augeas-lenses lsb-release &&
+        : ::client:: && me=$(hostname -f) && [ "$me" != "${me%debian.org}" ] && apt-get update &&
+                apt-get install -y --no-install-recommends puppet libaugeas-ruby1.8 augeas-lenses lsb-release &&

                 /etc/init.d/puppet stop &&
                 /etc/init.d/puppet stop &&

-                (puppetd -t || true ) &&
+                (puppet agent -t || true ) &&

                 cd /var/lib/puppet/ssl/certificate_requests &&
                 echo sha256sum output: && echo &&
                 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
                 echo && echo && cd /
 
 This will not overwrite anything yet, since handel has not signed the


@@ -51,7 +51,7 @@ although the config files should remain identical before and after.
 
 Then run (this will change the configs in /etc):
 
 
 Then run (this will change the configs in /etc):
 

-        : ::client:: && puppetd -t
+        : ::client:: && puppet agent -t

 
 This run will start puppet after reconfiguring it, so if you are 
 unhappy with what just happened, you'll need to stop it again to do 
 
 This run will start puppet after reconfiguring it, so if you are 
 unhappy with what just happened, you'll need to stop it again to do