X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Falioth_archive.pp;h=cafe458073d21d60d3e2c397c5d6e6105f3f6930;hb=0913dd3e8f67df7ffa7c23fd5144b5c0dff2ef5b;hp=b814b57c8182b56aa9e36424a6027c8df099b744;hpb=0b9c56431623eeb69b6a70f32bddc0c083f797c9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/alioth_archive.pp b/modules/roles/manifests/alioth_archive.pp
index b814b57c8..cafe45807 100644
--- a/modules/roles/manifests/alioth_archive.pp
+++ b/modules/roles/manifests/alioth_archive.pp
@@ -1,10 +1,12 @@
 class roles::alioth_archive {
 	include apache2
+	include apache2::expires
+	include apache2::rewrite
 	include apache2::ssl
 
 	apache2::site { '020-alioth-archive.debian.org':
 		site   => 'alioth-archive.debian.org',
-		content => template('roles/alioth_archive.debian.org.erb')
+		content => template('roles/apache-alioth-archive.debian.org.erb')
 	}
 	ssl::service { 'alioth-archive.debian.org':
 		notify => Exec['service apache2 reload'],
@@ -25,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',