X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=85c5528a8a39f091673098ca2623fc4fa655c3c8;hb=741b35000ab2f737da8ee02560b60511c8e0bf24;hp=b8e76ad8e08b9ca2365af90c727ac0b91cb4e033;hpb=b378f5d0e59f2a4d9d8905d4ce6873902fce8604;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b8e76ad8e..85c5528a8 100644
--- 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,19 @@ 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'],
+	}
+	concat::fragment { 'puppet-ssl-key-pins-header':
+		target => '/etc/apache2/conf-available/puppet-ssl-key-pins.conf',
+		content => '',
+		order  => 00,
+	}
+	apache2::config { 'puppet-ssl-key-pins':
+		nocontentok => true,
+	}
 }