X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fanonscm.pp;h=0342a251e69a02206c784bfa10ed456dd69eafd4;hb=903e4d6a11f83d89048e1b2870013d27925aef41;hp=ed3c23f3eb91505879f92c09f98e9cfc8fa251f6;hpb=b93b11ac11a497249640867525733ffadc6a278d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/anonscm.pp b/modules/roles/manifests/anonscm.pp
index ed3c23f3e..0342a251e 100644
--- a/modules/roles/manifests/anonscm.pp
+++ b/modules/roles/manifests/anonscm.pp
@@ -10,7 +10,31 @@ class roles::anonscm {
 		site   => 'anonscm.debian.org',
 		content => template('roles/anonscm/anonscm.debian.org.conf.erb')
 	}
-	#apache2::config { 'anonscm-map':
-	#	content => template('roles/anonscm/anonscm.map.erb'),
-	#}
+
+	concat { '/etc/apache2/conf-available/anonscm.map.conf': }
+	concat::fragment { 'anonscm.map-header':
+		target => '/etc/apache2/conf-available/anonscm.map.conf',
+		order  => '000',
+		content  => @(EOF)
+			## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+			<Macro anonscm.debian.org-anonscm-map>
+			| EOF
+	}
+	concat::fragment { 'anonscm.map-body':
+		target => '/etc/apache2/conf-available/anonscm.map.conf',
+		order  => '400',
+		source => 'puppet:///modules/roles/anonscm/anonscm.map',
+	}
+	concat::fragment { 'anonscm.map-tail':
+		target => '/etc/apache2/conf-available/anonscm.map.conf',
+		order  => '900',
+		content  => @(EOF)
+			</Macro anonscm.debian.org-anonscm-map>
+			| EOF
+	}
+	file { "/etc/apache2/conf-enabled/anonscm.map.conf":
+		ensure => link,
+		target => "../conf-available/anonscm.map.conf",
+		notify  => Exec['service apache2 reload'],
+	}
 }