X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Falioth_archive.pp;h=cafe458073d21d60d3e2c397c5d6e6105f3f6930;hb=1243bf252a0fc453755439a860e90a6d0fd30f48;hp=69587092e954ee7eecbf8f8cfcc251300b49d37b;hpb=59bff1e3e4351cbbf93df00a050248bac979863c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/alioth_archive.pp b/modules/roles/manifests/alioth_archive.pp
index 69587092e..cafe45807 100644
--- a/modules/roles/manifests/alioth_archive.pp
+++ b/modules/roles/manifests/alioth_archive.pp
@@ -1,19 +1,41 @@
 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/XXX.debian.org':
-	#	ensure  => directory,
-	#	mode    => '2755',
-	#	owner   => XXX,
-	#	group   => XXX,
-	#}
+	file { '/srv/alioth-archive.debian.org':
+		ensure  => directory,
+		mode    => '2755',
+		owner   => "alioth-archive",
+		group   => "alioth-archive",
+	}
+
+	file { '/srv/alioth-archive.debian.org/home':
+		ensure  => directory,
+		mode    => '2755',
+		owner   => "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',
+	}
 }