From 98fdc9abe34b67c5118c53ec7b01090f92461260 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 18 Apr 2013 17:31:26 +0200 Subject: [PATCH] puppet agent -t --- input/howto/new-machine.creole | 2 +- input/howto/puppet-setup.mdwn | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole index e66b0f0..77ce6dd 100644 --- a/input/howto/new-machine.creole +++ b/input/howto/new-machine.creole @@ -74,7 +74,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup * run puppet a couple times {{{ - puppetd -t; puppetd -t; puppetd -t; puppetd -t + puppet agent -t; puppet agent -t; puppet agent -t; puppet agent -t }}} * try to login using your user and ssh key. you should get a homedir. diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn index 689b2d9..f96c5f9 100644 --- a/input/howto/puppet-setup.mdwn +++ b/input/howto/puppet-setup.mdwn @@ -10,12 +10,12 @@ 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. - : __handel__ && puppetd -t --environment=production + : __handel__ && puppet agent -t --environment=production : ::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 && - (puppetd -t || true ) && + (puppet agent -t || true ) && cd /var/lib/puppet/ssl/certificate_requests && echo sha256sum output: && echo && sha256sum $me.pem && @@ -51,7 +51,7 @@ although the config files should remain identical before and after. 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 -- 2.20.1