From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 17 Dec 2012 13:31:02 +0000 (+0100)
Subject: static-vhost.conf is a template
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c5c3b36a0c3421802e8a62aae76a2604a29d1dd1;p=mirror%2Fdsa-puppet.git

static-vhost.conf is a template
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 0acc1b9f2..88d105b03 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -11,7 +11,7 @@ class roles::static_mirror {
 	apache2::module { 'expires': }
 
 	apache2::config { "local-static-vhost.conf":
-		source  => "puppet:///modules/roles/static-mirroring/static-vhost.conf",
+		content => template('roles/static-mirroring/static-vhost.conf.erb'),
 	}
 
 	file { '/usr/local/bin/static-mirror-run':
diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf b/modules/roles/templates/static-mirroring/static-vhost.conf
deleted file mode 100644
index ea0d2acb1..000000000
--- a/modules/roles/templates/static-mirroring/static-vhost.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-# puppet maintained
-
-<Macro common-static-vhost $name>
-<Macro common-$name>
-	<IfModule mod_userdir.c>
-		UserDir disabled
-	</IfModule>
-	ServerSignature On
-
-	DocumentRoot /srv/static.debian.org/cur/$name/
-	<Directory /srv/static.debian.org/cur/$name/>
-		AllowOverride FileInfo
-		Options Multiviews Indexes FollowSymLinks
-		IndexOptions FancyIndexing NameWidth=*
-		Order allow,deny
-		Allow from all
-	</Directory>
-
-	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-</Macro>
-
-<Virtualhost <%= vhost_listen %> >
-	ServerName $name
-	ServerAdmin debian-admin@lists.debian.org
-
-
-	ErrorLog /var/log/apache2/$name-error.log
-	CustomLog /var/log/apache2/$name-access.log combined
-
-	Use common-$name
-</VirtualHost>
-
-</Macro>
-
-# vim:ft=apache:
diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
new file mode 100644
index 000000000..ea0d2acb1
--- /dev/null
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -0,0 +1,35 @@
+# puppet maintained
+
+<Macro common-static-vhost $name>
+<Macro common-$name>
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
+	ServerSignature On
+
+	DocumentRoot /srv/static.debian.org/cur/$name/
+	<Directory /srv/static.debian.org/cur/$name/>
+		AllowOverride FileInfo
+		Options Multiviews Indexes FollowSymLinks
+		IndexOptions FancyIndexing NameWidth=*
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+</Macro>
+
+<Virtualhost <%= vhost_listen %> >
+	ServerName $name
+	ServerAdmin debian-admin@lists.debian.org
+
+
+	ErrorLog /var/log/apache2/$name-error.log
+	CustomLog /var/log/apache2/$name-access.log combined
+
+	Use common-$name
+</VirtualHost>
+
+</Macro>
+
+# vim:ft=apache: