Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 3d015cf45751c532d8a49a026592b4184062c0c4..7d4bf5c38bfefbabef219f032839187b2431e1db 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -57,6 +57,13 @@ class debian-org {
         "rsyslog": ensure => purged;
         "sysklogd": ensure => purged;
     }
+    case getfromhash($nodeinfo, 'broken-rtc') {
+        true: {
+            package {
+                fake-hwclock: ensure => installed;
+            }
+        }
+    }
     case $debarchitecture {
         "armhf": {}
         default: {

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 658c6d14c096c2187d641927df20886cb8bdcc9c..8110cac14abbab1a9cb3fdbf32c681e2438aef31 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -218,6 +218,7 @@ host_settings:
     - arne.debian.org
     - arnold.debian.org
     - ball.debian.org
+    - lucatelli.debian.org
     - rem.debian.org
     - sompek.debian.org
   buildd:

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 840832523f9cfc830c8dc32570af00b9c04eb5a6..777ce8fcb5fdd1c2a6d9e9105a950905482921f4 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -41,7 +41,7 @@ if (nodeinfo['ldap'].has_key?('purpose'))
     end
     purp += " porterbox\n"
     purp += "\n"
-    purp += "See 'dchroot -l' for a list of available chroots.\n"
+    purp += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
     if nodeinfo['ldap'].has_key?('admin')
       purp += "Please contact #{nodeinfo['ldap']['admin'][0]} for install requests,\n"
       purp += "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"