diff options
author | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
commit | 0e7099174fdef951c81880b51e23342fcde86374 (patch) | |
tree | 28e99fd804674e3ac025a73a061c73f0ce6d7870 /templates/vhosts/partials/std_override_options.erb | |
parent | 3ac4d6249f50627c0827ce3812eb21d5b89ed974 (diff) | |
parent | bf36ba5e988a7bb3f163ed0575020ef714519edc (diff) |
Merge remote-tracking branch 'shared/master' into riseup
Conflicts:
README
Diffstat (limited to 'templates/vhosts/partials/std_override_options.erb')
-rw-r--r-- | templates/vhosts/partials/std_override_options.erb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/templates/vhosts/partials/std_override_options.erb b/templates/vhosts/partials/std_override_options.erb new file mode 100644 index 0000000..95a5e6a --- /dev/null +++ b/templates/vhosts/partials/std_override_options.erb @@ -0,0 +1,4 @@ + 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 -%> + <% end -%> |