summaryrefslogtreecommitdiff
path: root/templates/vhosts/partials
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-04-14 23:03:56 +0200
committermh <mh@immerda.ch>2014-04-14 23:03:56 +0200
commit49d954d80d8b340dfcfdf939092d57754c3449f8 (patch)
tree5862e29b0cb272245618dfd41e926c23946f6b8d /templates/vhosts/partials
parentc52c48534d76b0a9c965784bd12eb1c1fccd94c6 (diff)
more identation fixing
Diffstat (limited to 'templates/vhosts/partials')
-rw-r--r--templates/vhosts/partials/authentication.erb8
-rw-r--r--templates/vhosts/partials/std_override_options.erb4
2 files changed, 6 insertions, 6 deletions
diff --git a/templates/vhosts/partials/authentication.erb b/templates/vhosts/partials/authentication.erb
index a6ebf3e..76f7870 100644
--- a/templates/vhosts/partials/authentication.erb
+++ b/templates/vhosts/partials/authentication.erb
@@ -1,6 +1,6 @@
<% unless htpasswd_file.to_s == 'absent' -%>
- AuthType Basic
- AuthName "Access fuer <%= servername %>"
- AuthUserFile <%= real_htpasswd_path %>
- require valid-user
+ AuthType Basic
+ AuthName "Access fuer <%= servername %>"
+ AuthUserFile <%= real_htpasswd_path %>
+ require valid-user
<% end -%>
diff --git a/templates/vhosts/partials/std_override_options.erb b/templates/vhosts/partials/std_override_options.erb
index a69250d..f35354d 100644
--- a/templates/vhosts/partials/std_override_options.erb
+++ b/templates/vhosts/partials/std_override_options.erb
@@ -1,4 +1,4 @@
- AllowOverride <%= allow_override %>
+ AllowOverride <%= allow_override %>
<% if options.to_s != 'absent' || do_includes.to_s == 'true' || run_mode == 'fcgid' -%>
- Options <%- unless options.to_s == 'absent' then -%><%= options %><% end -%><% if do_includes.to_s == 'true' && !options.include?('+Includes') -%> +Includes<% end -%><% if run_mode == 'fcgid' && !options.include?('+ExecCGI') -%> +ExecCGI<% end -%>
+ Options <%- unless options.to_s == 'absent' then -%><%= options %><% end -%><% if do_includes.to_s == 'true' && !options.include?('+Includes') -%> +Includes<% end -%><% if run_mode == 'fcgid' && !options.include?('+ExecCGI') -%> +ExecCGI<% end -%>
<% end -%>