diff options
author | mh <mh@immerda.ch> | 2011-05-17 23:16:43 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2011-05-17 23:16:43 +0200 |
commit | cd1150af3af7411c88835d8fa5e41c40d40146fb (patch) | |
tree | 4c343cb78f61b424aed9e4bffdd45aa1c6cda374 /templates/vhosts/static/static.erb | |
parent | 09d598562f66e524e24ca4b1a924a43bb89cecfc (diff) |
switching logs over to partials
Diffstat (limited to 'templates/vhosts/static/static.erb')
-rw-r--r-- | templates/vhosts/static/static.erb | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/templates/vhosts/static/static.erb b/templates/vhosts/static/static.erb index 55ae5ac..05760d6 100644 --- a/templates/vhosts/static/static.erb +++ b/templates/vhosts/static/static.erb @@ -11,23 +11,7 @@ <%- end -%> DocumentRoot <%= documentroot %>/ - <%- case logmode.to_s - when 'nologs' -%> - ErrorLog /dev/null - CustomLog /dev/null - <%- when 'semianonym' -%> - ErrorLog <%= logdir %>/error_log - CustomLog <%= logdir %>/access_log noip - <%- when 'anonym' -%> - ErrorLog /dev/null - CustomLog <%= logdir %>/access_log noip - <%- else -%> - ErrorLog <%= logdir %>/error_log - CustomLog <%= logdir %>/access_log combined - <%- end -%> - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> - <%- end -%> +<%= scope.function_template('apache/vhosts/partials/logs.erb') %> <%- if ssl_mode.to_s == 'force' then -%> RewriteEngine On RewriteCond %{HTTPS} !=on @@ -72,20 +56,7 @@ <%- end -%> DocumentRoot <%= documentroot %>/ - <%- case logmode.to_s - when 'nologs' -%> - ErrorLog /dev/null - CustomLog /dev/null - <%- when 'semianonym' -%> - ErrorLog <%= logdir %>/error_log - CustomLog <%= logdir %>/access_log noip - <%- when 'anonym' -%> - ErrorLog /dev/null - CustomLog <%= logdir %>/access_log noip - <%- else -%> - ErrorLog <%= logdir %>/error_log - CustomLog <%= logdir %>/access_log combined - <%- end -%> +<%= scope.function_template('apache/vhosts/partials/logs.erb') %> <%- if default_charset.to_s != 'absent' then -%> AddDefaultCharset <%= default_charset %> |