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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Remove sompek from broken-rtc
  All the armhfs hosts have a broken RTC, don't they?

diff --git a/modules/dacs/files/per-host/rossini.debian.org/acl-private.0 b/modules/dacs/files/per-host/rossini.debian.org/acl-private.0
index 1da563da9be6369341b23f68316d52b8a19530ef..9f891825e314f3122cdb9cfad7d7edee51236f5e 100644 (file)
--- a/modules/dacs/files/per-host/rossini.debian.org/acl-private.0
+++ b/modules/dacs/files/per-host/rossini.debian.org/acl-private.0
@@ -3,6 +3,9 @@
       <service url_pattern="/*"/>
   </services>
   <rule order="allow,deny" pass_http_cookie="yes">
+   <allow>
+       from("206.12.19.118")
+   </allow>
    <allow>
        user("auth")
    </allow>

diff --git a/modules/dacs/files/per-host/spohr.debian.org/acl-private.0 b/modules/dacs/files/per-host/spohr.debian.org/acl-private.0
index 1da563da9be6369341b23f68316d52b8a19530ef..9f891825e314f3122cdb9cfad7d7edee51236f5e 100644 (file)
--- a/modules/dacs/files/per-host/spohr.debian.org/acl-private.0
+++ b/modules/dacs/files/per-host/spohr.debian.org/acl-private.0
@@ -3,6 +3,9 @@
       <service url_pattern="/*"/>
   </services>
   <rule order="allow,deny" pass_http_cookie="yes">
+   <allow>
+       from("206.12.19.118")
+   </allow>
    <allow>
        user("auth")
    </allow>