diff options
| author | mh <mh@immerda.ch> | 2011-10-08 12:31:14 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-10-08 12:31:14 +0200 |
| commit | 9f52ab2655acccd47cf7e3a824b603c5d6846f35 (patch) | |
| tree | 167561f632d79e79e873865fdf598919fd2b731b /templates/vhosts/redirect | |
| parent | 34df80bc271f7ed17de879e82b54f31a98926e08 (diff) | |
migrating a first part over to the new partial style
Diffstat (limited to 'templates/vhosts/redirect')
| -rw-r--r-- | templates/vhosts/redirect/partial.erb | 1 | ||||
| -rw-r--r-- | templates/vhosts/redirect/redirect.erb | 32 |
2 files changed, 1 insertions, 32 deletions
diff --git a/templates/vhosts/redirect/partial.erb b/templates/vhosts/redirect/partial.erb new file mode 100644 index 0000000..bd012c8 --- /dev/null +++ b/templates/vhosts/redirect/partial.erb @@ -0,0 +1 @@ + Redirect permanent / https://<%= options %>
\ No newline at end of file diff --git a/templates/vhosts/redirect/redirect.erb b/templates/vhosts/redirect/redirect.erb deleted file mode 100644 index 6fc6922..0000000 --- a/templates/vhosts/redirect/redirect.erb +++ /dev/null @@ -1,32 +0,0 @@ -# <%= servername %> -<%- unless ssl_mode.to_s == 'only' then -%> -<VirtualHost *:80> -<% scope.unsetvar('vhost_part') - scope.setvar('vhost_part',:normal) -%> - <%= scope.function_template('apache/vhosts/partials/header_default.erb') %> -<% scope.unsetvar('vhost_part') -%> - -<%= scope.function_template('apache/vhosts/partials/logs.erb') %> - <%- if ssl_mode.to_s == 'force' then -%> - RewriteEngine On - RewriteCond %{HTTPS} !=on - RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L] - <% else -%> - Redirect permanent / http://<%= options %> - <%- end -%> -</VirtualHost> -<%- end -%> - -<%- unless ssl_mode.to_s == 'false' then -%> -<VirtualHost *:443> -<% scope.unsetvar('vhost_part') - scope.setvar('vhost_part',:ssl) -%> - <%= scope.function_template('apache/vhosts/partials/header_default.erb') %> -<% scope.unsetvar('vhost_part') -%> - -<%= scope.function_template('apache/vhosts/partials/logs.erb') %> - - Redirect permanent / https://<%= options %> - -</VirtualHost> -<%- end -%> |