From 903e4d6a11f83d89048e1b2870013d27925aef41 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 31 May 2018 17:22:07 +0200
Subject: [PATCH] try to put anonscm.map onto host

---
 .../anonscm/anonscm.map}                      |  0
 modules/roles/manifests/anonscm.pp            | 30 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)
 rename modules/roles/{templates/anonscm/anonscm.map.erb => files/anonscm/anonscm.map} (100%)

diff --git a/modules/roles/templates/anonscm/anonscm.map.erb b/modules/roles/files/anonscm/anonscm.map
similarity index 100%
rename from modules/roles/templates/anonscm/anonscm.map.erb
rename to modules/roles/files/anonscm/anonscm.map
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'],
+	}
 }
-- 
2.20.1