Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet

diff --git a/hieradata/ana.yaml b/hieradata/ana.yaml
index ddd97b3..f8ddf31 100644 (file)
--- a/hieradata/ana.yaml
+++ b/hieradata/ana.yaml
@@ -1,4 +1,4 @@
-----
+---
 nameservers:
   - 150.203.1.10
   - 150.203.164.10

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 2a5beb0..ea0fa67 100644 (file)
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -18,14 +18,8 @@
        <IfModule mod_userdir.c>
                UserDir disabled
        </IfModule>
-<%=
-case fqdn
-  when "spohr.debian.org" then
-    out += "
-        Alias /debian \"/srv/mirrors/ftp.debian.org/ftp\"
-"
-end
-out
-%>
+<% if hostname == "spohr" -%>
+        Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
+<% end -%>
 </VirtualHost>
 # vim:set syn=apache:

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 4a815cb..8cc742a 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -38,24 +38,24 @@ server 82.195.75.109        iburst
 server 5.153.231.242        iburst
 server 206.12.19.218        iburst
 
-server czerny.debian.org iburst
-server clementi.debian.org iburst
-server bm-bl1.debian.org iburst
-server bm-bl2.debian.org iburst
-server dijkstra.debian.org iburst
-server luchesi.debian.org iburst
+server czerny.debian.org    iburst
+server clementi.debian.org  iburst
+server bm-bl1.debian.org    iburst
+server bm-bl2.debian.org    iburst
+server dijkstra.debian.org  iburst
+server luchesi.debian.org   iburst
 <% else -%>
-server czerny.debian.org    iburst autokey
-server clementi.debian.org    iburst autokey
-server bm-bl1.debian.org    iburst autokey
-server bm-bl2.debian.org    iburst autokey
-server dijkstra.debian.org    iburst autokey
-server luchesi.debian.org    iburst autokey
-restrict czerny.debian.org    notrust nomodify notrap ntpport
-restrict clementi.debian.org    notrust nomodify notrap ntpport
-restrict bm-bl1.debian.org    notrust nomodify notrap ntpport
-restrict bm-bl2.debian.org    notrust nomodify notrap ntpport
-restrict dijkstra.debian.org    notrust nomodify notrap ntpport
+server czerny.debian.org       iburst autokey
+server clementi.debian.org     iburst autokey
+server bm-bl1.debian.org       iburst autokey
+server bm-bl2.debian.org       iburst autokey
+server dijkstra.debian.org     iburst autokey
+server luchesi.debian.org      iburst autokey
+restrict czerny.debian.org     notrust nomodify notrap ntpport
+restrict clementi.debian.org   notrust nomodify notrap ntpport
+restrict bm-bl1.debian.org     notrust nomodify notrap ntpport
+restrict bm-bl2.debian.org     notrust nomodify notrap ntpport
+restrict dijkstra.debian.org   notrust nomodify notrap ntpport
 restrict luchesi.debian.org    notrust nomodify notrap ntpport
 <% end -%>
 

diff --git a/modules/roles/files/security_mirror/security.debian.org b/modules/roles/files/security_mirror/security.debian.org
index c6580c5..e526111 100644 (file)
--- a/modules/roles/files/security_mirror/security.debian.org
+++ b/modules/roles/files/security_mirror/security.debian.org
@@ -35,6 +35,11 @@
        </FilesMatch>
    </Directory>
 
+   <Directory /org/security.debian.org/ftp/dists>
+       ExpiresDefault "access plus 1 seconds"
+       Header append Cache-Control "public"
+   </Directory>
+
    RewriteEngine on
    RewriteRule ^/$      http://www.debian.org/security/
 

diff --git a/modules/roles/templates/weblog_destination-authorized_keys.erb b/modules/roles/templates/weblog_destination-authorized_keys.erb
index c23b175..fc21537 100644 (file)
--- a/modules/roles/templates/weblog_destination-authorized_keys.erb
+++ b/modules/roles/templates/weblog_destination-authorized_keys.erb
@@ -25,7 +25,7 @@ localinfo.keys.sort.each do |node|
 end
 
 lines = []
-for m in mirrors:
+for m in mirrors do
     lines << '# ' + m['node']
     if m['key'].nil?
         lines << "# no key for node"