diff options
| author | mh <mh@immerda.ch> | 2008-11-08 14:22:42 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-11-08 14:22:42 +0000 |
| commit | f4ff26f1b89c405f714aca98cd2078fab678ae1e (patch) | |
| tree | f1de2f6c1c52a81e9c650a65a10714c3090cdc92 /templates | |
| parent | c92a170b34bfd26910793479b63e86184f702296 (diff) | |
added options for vhosts
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 4 | ||||
| -rw-r--r-- | templates/vhosts/static/OpenBSD.erb | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index 6e991be..53251ad 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -12,7 +12,9 @@ <Directory "<%= documentroot %>"> AllowOverride <%= allow_override %> - + <%- unless options.to_s == 'absent' then -%> + Options <%= options %> + <%- end %> php_admin_flag engine on php_admin_value open_basedir <%= documentroot %>:<%= php_upload_tmp_dir %>:<%= php_session_save_path %> php_admin_value upload_tmp_dir <%= php_upload_tmp_dir %> diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb index 7751c6d..d5714f0 100644 --- a/templates/vhosts/static/OpenBSD.erb +++ b/templates/vhosts/static/OpenBSD.erb @@ -14,6 +14,12 @@ Redirect permanent / https://<%= servername %>/ <%- end %> + <%- unless options.to_s == 'absent' then -%> + <Directory "<%= documentroot %>"> + Options <%= options %> + </Directory> + + <%- end %> <%- unless additional_options.to_s == 'absent' then -%> <%= additional_options %> <%- end -%> @@ -31,6 +37,12 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined + <%- unless options.to_s == 'absent' then -%> + <Directory "<%= documentroot %>"> + Options <%= options %> + </Directory> + + <%- end %> <%- unless additional_options.to_s == 'absent' then -%> <%= additional_options %> <%- end -%> |