diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-05-18 14:10:32 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-05-18 14:10:32 -0300 |
| commit | 0030f7e66db85a9859a4b17609b6b12e631aafdc (patch) | |
| tree | 57c4ac81f283acd868eb356c9dd6851a8d17069a /templates | |
| parent | 45a5dc053f67b0b881c9dd0a5bbd20e862b3be1c (diff) | |
| download | puppet-apache-0030f7e66db85a9859a4b17609b6b12e631aafdc.tar.gz puppet-apache-0030f7e66db85a9859a4b17609b6b12e631aafdc.tar.bz2 | |
Coding style
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/site.erb | 10 |
1 files changed, 5 insertions, 5 deletions
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| -%> |