raise max-age for HTTP Public Key Pins from 5 min to 1 hour

[mirror/dsa-puppet.git] / modules / roles / templates / security_mirror / security.debian.org.erb

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index 5294a1f..c5961ea 100644 (file)
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -8,9 +8,7 @@
    Options +FollowSymLinks
    Options +Indexes
    FileETag MTime Size
-   <% if @lsbmajdistrelease > '7' -%>
-     Require all granted
-   <% end -%>
+   Require all granted
 </Directory>
 
 <VirtualHost *:80>
@@ -27,6 +25,10 @@
    ServerAlias security-cdn1.debian.org
    ServerAlias security-cdn2.debian.org
    ServerAlias security-nagios.debian.org
+   <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
+   ServerAlias <%= scope.function_onion_global_service_hostname(['security.debian.org']) %>
+   <% end %>
+
 
    ExpiresActive On
    ExpiresDefault "access plus 2 minutes"