X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=15a2a341c86eb5bfe3f1164e94ee69c6ba974a34;hb=5d85b5bf619e6c318dc03d1536d1f871ee4f25b4;hp=decec23e68ff61e06cf50032fa8e6ac264603a9a;hpb=b98ca19d555504c1b3909da4b2680e0041d7dd3e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index decec23e6..15a2a341c 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -139,7 +139,7 @@ class apache2 {
 		script => 'ps_',
 	}
 
-	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1,pkgmirror-csail] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':
@@ -162,4 +162,9 @@ class apache2 {
 		refreshonly => true,
 		require =>  Package['apache2'],
 	}
+
+	apache2::config { 'puppet-ssl-key-pins':
+		content => template('apache2/ssl-key-pins.erb'),
+		notify  => Exec['service apache2 reload'],
+	}
 }