X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=cd4f1f7bdcb7099cff15c4367627e398331f42a1;hb=a03ae6b216dc18483650e64d452ad2c1d8038f0b;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..cd4f1f7bd 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -19,14 +19,7 @@ class apache2 {
 	apache2::module { 'info': }
 	apache2::module { 'status': }
 	apache2::module { 'headers': }
-
-	package { 'libapache2-mod-macro':
-		ensure => installed
-	}
-
-	apache2::module { 'macro':
-		require => Package['libapache2-mod-macro']
-	}
+	apache2::module { 'macro': }
 
 	apache2::site { '00-default':
 		site     => 'default-debian.org',
@@ -139,7 +132,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 +155,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'],
+	}
 }