diff options
| author | elijah <elijah@riseup.net> | 2014-05-24 01:35:54 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-06-02 11:28:27 -0700 |
| commit | 24f0cc3c64aab59db436e0827ba24ec08023100a (patch) | |
| tree | 179c4464d13b3aed4e8b6b78735508c4bd7cb700 /puppet/modules/site_static/templates | |
| parent | 09916946f8eb0ab17689255fd626a52ef1808e6a (diff) | |
added support for /provider.json served from static site.
Diffstat (limited to 'puppet/modules/site_static/templates')
| -rw-r--r-- | puppet/modules/site_static/templates/apache.conf.erb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/puppet/modules/site_static/templates/apache.conf.erb b/puppet/modules/site_static/templates/apache.conf.erb index 2abe1a98..b694d44c 100644 --- a/puppet/modules/site_static/templates/apache.conf.erb +++ b/puppet/modules/site_static/templates/apache.conf.erb @@ -16,11 +16,16 @@ end end document_root = document_root.gsub(%r{^/|/$}, '') + bootstrap_domain = scope.lookupvar('site_static::bootstrap_domain') + bootstrap_client = scope.lookupvar('site_static::bootstrap_client') -%> <VirtualHost *:80> ServerName <%= @domain %> ServerAlias www.<%= @domain %> +<%- @aliases && @aliases.each do |domain_alias| -%> + ServerAlias <%= domain_alias %> +<%- end -%> RewriteEngine On RewriteRule ^.*$ https://<%= @domain -%>%{REQUEST_URI} [R=permanent,L] </VirtualHost> @@ -28,6 +33,9 @@ <VirtualHost *:443> ServerName <%= @domain %> ServerAlias www.<%= @domain %> +<%- @aliases && @aliases.each do |domain_alias| -%> + ServerAlias <%= domain_alias %> +<%- end -%> #RewriteLog "/var/log/apache2/rewrite.log" #RewriteLogLevel 3 @@ -62,6 +70,12 @@ Order deny,allow Allow from all </Directory> + <%- if ([@aliases]+[@domain]).flatten.include?(bootstrap_domain) -%> + Alias /provider.json /srv/leap/provider.json + <Location /provider.json> + Header set X-Minimum-Client-Version <%= bootstrap_client['min'] %> + </Location> + <%- end -%> <%- else -%> AliasMatch ^/[a-z]{2}/<%=path%>(/.+|/|)$ "/<%=directory%>/$1" Alias /<%=path%> "/<%=directory%>/" |