puppet-ssl-key-pins.conf is a concat, cannot set it as source/content

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b8e76ad..3f854a7 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -87,6 +87,10 @@ class apache2 {
                source => 'puppet:///modules/apache2/puppet-ssl-macros',
        }
 
+       apache2::config { 'puppet-ftp-macros':
+               source => 'puppet:///modules/apache2/puppet-ftp-macros',
+       }
+
        apache2::config { 'puppet-config':
                content => template('apache2/puppet-config.erb'),
        }
@@ -109,7 +113,7 @@ class apache2 {
                source => 'puppet:///modules/apache2/apache2.logrotate',
        }
 
-       file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs' ]:
+       file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs', '/srv/www/default.debian.org/htdocs-disabled' ]:
                ensure  => directory,
                mode    => '0755',
        }
@@ -118,6 +122,10 @@ class apache2 {
                content => template('apache2/default-index.html'),
        }
 
+       file { '/srv/www/default.debian.org/htdocs-disabled/index.html':
+               content => template('apache2/disabled-index.html'),
+       }
+
        file { '/var/log/apache2/.nobackup':
                mode    => '0644',
                content => '',
@@ -131,7 +139,7 @@ class apache2 {
                script => 'ps_',
        }
 
-       if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
+       if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1,pkgmirror-csail] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':
@@ -154,4 +162,14 @@ class apache2 {
                refreshonly => true,
                require =>  Package['apache2'],
        }
+
+       concat { '/etc/apache2/conf-available/puppet-ssl-key-pins.conf':
+               owner   => root,
+               group   => root,
+               mode    => '0644',
+               require =>  Package['apache2'],
+       }
+       apache2::config { 'puppet-ssl-key-pins':
+               nocontentok => true,
+       }
 }