X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Falioth_archive.pp;h=cafe458073d21d60d3e2c397c5d6e6105f3f6930;hb=e71099e47c57303bb7090e404db84ad3e8d3b75b;hp=549fe0200b8e07e0517b8ad719f4c5a1c1473ce2;hpb=42390875ead78abe039b26f6a54679f33d448d99;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/alioth_archive.pp b/modules/roles/manifests/alioth_archive.pp
index 549fe0200..cafe45807 100644
--- a/modules/roles/manifests/alioth_archive.pp
+++ b/modules/roles/manifests/alioth_archive.pp
@@ -1,14 +1,17 @@
 class roles::alioth_archive {
 	include apache2
+	include apache2::expires
+	include apache2::rewrite
 	include apache2::ssl
 
-	#apache2::site { 'XXX.debian.org':
-	#	content => template('roles/alioth_archive/XXX.debian.org.erb')
-	#}
-	#ssl::service { 'XXX.debian.org':
-	#	notify => Exec['service apache2 reload'],
-	#	key => true,
-	#}
+	apache2::site { '020-alioth-archive.debian.org':
+		site   => 'alioth-archive.debian.org',
+		content => template('roles/apache-alioth-archive.debian.org.erb')
+	}
+	ssl::service { 'alioth-archive.debian.org':
+		notify => Exec['service apache2 reload'],
+		key => true,
+	}
 
 	file { '/srv/alioth-archive.debian.org':
 		ensure  => directory,
@@ -24,6 +27,13 @@ class roles::alioth_archive {
 		group   => "alioth-archive",
 	}
 
+	file { '/srv/alioth-archive.debian.org/htdocs':
+		ensure  => directory,
+		mode    => '2755',
+		owner   => "alioth-archive",
+		group   => "alioth-archive",
+	}
+
 	file { '/home/alioth-archive':
 		ensure => link,
 		target => '/srv/alioth-archive.debian.org/home',