summaryrefslogtreecommitdiff
path: root/templates/site.erb
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-11-03 16:59:07 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-11-03 16:59:07 -0200
commitb1bf78c8af695cc306fe8051eec4dc956f1eb826 (patch)
tree123abc7e8346317efcc5913b7af0859045df722c /templates/site.erb
parentc5f141db8cd3961ba2d62763dd1d0975ed8f6956 (diff)
downloadpuppet-apache-b1bf78c8af695cc306fe8051eec4dc956f1eb826.tar.gz
puppet-apache-b1bf78c8af695cc306fe8051eec4dc956f1eb826.tar.bz2
Fix template deprecations
Diffstat (limited to 'templates/site.erb')
-rw-r--r--templates/site.erb78
1 files changed, 39 insertions, 39 deletions
diff --git a/templates/site.erb b/templates/site.erb
index dd6c243..e2ebbf5 100644
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -1,63 +1,63 @@
-# begin vhost for <%= title %>
-<VirtualHost <%= listen %>:<%= scope.lookupvar('apache::http_port') %>>
- ServerName <%= title %>.<%= hosting_domain %>
-<% if server_alias != false %> ServerAlias <%= server_alias %><% end %>
- DocumentRoot <%= docroot %>
-<% if https_redirect != false or canonical != false %>
+# begin vhost for <%= @title %>
+<VirtualHost <%= @listen %>:<%= scope.lookupvar('apache::http_port') %>>
+ ServerName <%= @title %>.<%= @hosting_domain %>
+<% if @server_alias != false %> ServerAlias <%= @server_alias %><% end %>
+ DocumentRoot <%= @docroot %>
+<% if @https_redirect != false or @canonical != false %>
RewriteEngine On
<% end -%>
-<% if https_redirect != false %>
+<% if @https_redirect != false %>
# 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| -%>
+<% 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| -%>
Alias <%= map %>
<% end -%><% end -%>
-<% if use != false %><% use.each do |instance| -%>
+<% if @use != false %><% @use.each do |instance| -%>
Use <%= instance %>
<% end -%><% end -%>
-<% if mpm == true %>
+<% if @mpm == true %>
<IfModule mpm_itk_module>
- AssignUserId <%= user %> <%= gid %>
+ AssignUserId <%= @user %> <%= @gid %>
</IfModule>
<% end %>
-<% if canonical != false %>
- <%- for canonical_exception in canonical_exceptions -%>
+<% if @canonical != false %>
+ <%- for canonical_exception in @canonical_exceptions -%>
RewriteCond %{HTTP_HOST} !=<%= canonical_exception %> [NC]
<%- end -%>
- RewriteCond %{HTTP_HOST} !=<%= canonical %> [NC]
+ RewriteCond %{HTTP_HOST} !=<%= @canonical %> [NC]
RewriteCond %{HTTP_HOST} !=""
- RewriteRule ^/(.*) <%= protocol %>://<%= canonical %>/$1 [L,R=301]
+ RewriteRule ^/(.*) <%= @protocol %>://<%= @canonical %>/$1 [L,R=301]
<% end %>
-<% if custom_directives != false -%>
- <%= custom_directives %>
+<% if @custom_directives != false -%>
+ <%= @custom_directives %>
<% end -%>
</VirtualHost>
-# end vhost for <%= title %>
-<% if ssl == true %>
-# begin ssl vhost for <%= title %>
-<VirtualHost <%= listen %>:<%= scope.lookupvar('apache::https_port') %>>
+# end vhost for <%= @title %>
+<% if @ssl == true %>
+# begin ssl vhost for <%= @title %>
+<VirtualHost <%= @listen %>:<%= scope.lookupvar('apache::https_port') %>>
# Use HTTP Strict Transport Security to force client to use secure connections only
Header always set Strict-Transport-Security "max-age=15768000; includeSubDomains"
- ServerName <%= title %>.<%= hosting_domain %>
-<% if server_alias != false %> ServerAlias <%= server_alias %><% end %>
- DocumentRoot <%= docroot %>
-<% 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| -%>
- Alias <%= map %>
+ ServerName <%= @title %>.<%= @hosting_domain %>
+<% if @server_alias != false %> ServerAlias <%= @server_alias %><% end %>
+ DocumentRoot <%= @docroot %>
+<% 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| -%>
+ Alias <%= @map %>
<% end -%><% end -%>
-<% if use != false %><% use.each do |instance| -%>
+<% if @use != false %><% @use.each do |instance| -%>
Use <%= instance %>
<% end -%><% end -%>
-<% if custom_directives != false -%>
- <%= custom_directives %>
+<% if @custom_directives != false -%>
+ <%= @custom_directives %>
<% end -%>
-<% if mpm == true %>
+<% if @mpm == true %>
<IfModule mpm_itk_module>
- AssignUserId <%= user %> <%= gid %>
+ AssignUserId <%= @user %> <%= @gid %>
</IfModule>
<% end %>
# SSL Configuration
@@ -66,8 +66,8 @@
SSLCipherSuite ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:!RC4:HIGH:!MD5:!aNULL:!EDH
SSLHonorCipherOrder on
SSLCompression off
- SSLCertificateFile /etc/ssl/certs/<%= title %>.crt
- SSLCertificateKeyFile /etc/ssl/private/<%= title %>.pem
+ SSLCertificateFile /etc/ssl/certs/<%= @title %>.crt
+ SSLCertificateKeyFile /etc/ssl/private/<%= @title %>.pem
</VirtualHost>
-# end ssl vhost for <%= title %>
-<% end %>
+# end ssl vhost for <%= @title %>
+<% end %>