From: Martin Zobel-Helas <zobel@debian.org>
Date: Tue, 16 Apr 2013 21:59:28 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=890db3e105a91e018ed2fa1f5e3f4ce74861b066;hp=74d366e3e9c853ddb9f6471997cbdabc0b1f21a6;p=mirror%2Fdsa-wiki.git

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  Do not prompt for puppet install
  Add typical expiry time for guest access
---

diff --git a/input/howto/add-guest.creole b/input/howto/add-guest.creole
index a569844..46999f7 100644
--- a/input/howto/add-guest.creole
+++ b/input/howto/add-guest.creole
@@ -31,3 +31,4 @@ Once that is done, to to db-master (aka draghi) and add the account:
 * note the -g, this is for guest accounts (doesn't prompt for -private etc.)
 * enter fingerprint, account name, [fml] name and forwarding address.
 * enter expiry date and hosts to allow access to, per the request.
+  Two months is typical.
diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index e15a7ba..689b2d9 100644
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -13,7 +13,7 @@ adjusted.
         : __handel__ && puppetd -t --environment=production
 
         : ::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 &&
+                apt-get install -y --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 &&