X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-archive.debian.org.erb;h=e8d84409dee3101fcb88c12397a1583701037398;hb=c46ff2155be94c3e1c3226879e13a8f31dbbac1b;hp=84026e8e5fe735d525660089db452535fd10f1ec;hpb=7d296b65a7dd50c5701b7e6a3acbbfbdc968615a;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb index 84026e8e5..e8d84409d 100644 --- a/modules/roles/templates/apache-archive.debian.org.erb +++ b/modules/roles/templates/apache-archive.debian.org.erb @@ -3,16 +3,7 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -<% - if not binds.kind_of?(Array) - raise Puppet::Error, "binds variable is not an array" - end - - vhost_listen = binds.map{|x| x+":80" }.join(' ') -%> - - -> +> ServerAdmin debian-admin@debian.org ServerName archive.debian.org <% if scope.function_onion_global_service_hostname(['archive.debian.org']) -%> @@ -22,13 +13,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 - > + > Require all granted Options +Indexes +FollowSymLinks