From: Silvio Rhatto Date: Fri, 18 May 2012 17:10:32 +0000 (-0300) Subject: Coding style X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0030f7e66db85a9859a4b17609b6b12e631aafdc;p=puppet-apache.git Coding style --- diff --git a/templates/site.erb b/templates/site.erb index 4daf2be..46c16d3 100644 --- a/templates/site.erb +++ b/templates/site.erb @@ -4,14 +4,14 @@ <% if server_alias != false %> ServerAlias <%= server_alias %><% end %> DocumentRoot <%= docroot %> <% if https_redirect != false or canonical != false %> - RewriteEngine On + RewriteEngine On <% end -%> <% if https_redirect != false %> - # Use HTTP Strict Transport Security to force client to use secure connections only - Header always set Strict-Transport-Security "max-age=15768000; includeSubDomains" + # Use HTTP Strict Transport Security to force client to use secure connections only + Header always set Strict-Transport-Security "max-age=15768000; includeSubDomains" - # Redirect all HTTP to HTTPS - RewriteRule ^(.*)$ https://%{HTTP_HOST}$1 [redirect=301]<% end %> + # Redirect all HTTP to HTTPS + RewriteRule ^(.*)$ https://%{HTTP_HOST}$1 [redirect=301]<% end %> <% if redirect_match != false %> RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= hosting_domain %>/<%= redirect_match %><% end %> <% if redirect != false %> Redirect <%= redirect %><% end %> <% if aliases != false %><% aliases.each do |map| -%>