support shipping a component to just a few mirrors

[mirror/dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index decec23..15a2a34 100644 (file)
--- 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'],
+       }
 }