diff options
author | mh <mh@immerda.ch> | 2008-11-30 13:23:41 +0000 |
---|---|---|
committer | mh <mh@immerda.ch> | 2008-11-30 13:23:41 +0000 |
commit | 734cf5b60fc6d4b18527303dca64acc538fec55c (patch) | |
tree | e6f2d06e96696c4f5ab334fa700e00ef5d11e863 /templates | |
parent | 6a48d7417ad609c6ed457477ba661f098ee65219 (diff) |
merged with puzzle
Diffstat (limited to 'templates')
-rw-r--r-- | templates/vhosts/php/CentOS.erb | 2 | ||||
-rw-r--r-- | templates/vhosts/static/CentOS.erb | 24 |
2 files changed, 24 insertions, 2 deletions
diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index 9c7722d..472afbc 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -16,12 +16,10 @@ Options <%= options %> <%- end -%> <%- unless htpasswd_file.to_s == 'absent' then -%> - AuthType Basic AuthName "Access fuer <%= servername %>" AuthUserFile <%= htpasswd_path %> require valid-user - <%- end -%> php_admin_flag engine on php_admin_value open_basedir <%= documentroot %>:<%= php_upload_tmp_dir %>:<%= php_session_save_path %> diff --git a/templates/vhosts/static/CentOS.erb b/templates/vhosts/static/CentOS.erb new file mode 100644 index 0000000..1019deb --- /dev/null +++ b/templates/vhosts/static/CentOS.erb @@ -0,0 +1,24 @@ +<VirtualHost *:80> + Include conf.d/defaults.inc + + ServerName <%= servername %> + <%- unless serveralias.to_s.empty? -%> + ServerAlias <%= serveralias %> + <%- end -%> + DocumentRoot <%= documentroot %> + + ErrorLog <%= logdir %>/error_log + CustomLog <%= logdir %>/access_log combined + + <Directory "<%= documentroot %>"> + AllowOverride <%= allow_override %> + </Directory> + + <IfModule mod_security2.c> + SecRuleEngine <%= if mod_security.to_s == 'true' then "On" else "Off" end %> + </IfModule> + + <%- unless additional_options == 'absent' then -%> + <%= additional_options %> + <%- end -%> +</VirtualHost> |