From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 19 Mar 2017 08:42:50 +0000 (+0000)
Subject: Fix historical mirror apache template
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fbd4579fc940f349d6dfc480381b3a671c453555;p=mirror%2Fdsa-puppet.git

Fix historical mirror apache template
---

diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb
index 84026e8e5..0cf3b0c4e 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -4,11 +4,11 @@
 ##
 
 <%
-  if not binds.kind_of?(Array)
+  if not @binds.kind_of?(Array)
     raise Puppet::Error, "binds variable is not an array"
   end
 
-  vhost_listen = binds.map{|x| x+":80" }.join(' ')
+  vhost_listen = @binds.map{|x| x+":80" }.join(' ')
 %>
 
 
@@ -22,13 +22,13 @@
 	ServerAlias *.archive.backend.mirrors.debian.org
 
 	#RedirectMatch "^/$" /debian-archive/
-	DocumentRoot <%= archive_root %>/
-	Alias /debian-archive/ <%= archive_root %>/
+	DocumentRoot <%= @archive_root %>/
+	Alias /debian-archive/ <%= @archive_root %>/
 
 	ErrorLog /var/log/apache2/archive.debian.org-error.log
 	CustomLog /var/log/apache2/archive.debian.org-access.log privacy
 
-	<Directory <%= archive_root %>>
+	<Directory <%= @archive_root %>>
 		Require all granted
 		Options +Indexes +FollowSymLinks
 	</Directory>