summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2011-05-17 23:16:43 +0200
committermh <mh@immerda.ch>2011-05-17 23:16:43 +0200
commitcd1150af3af7411c88835d8fa5e41c40d40146fb (patch)
tree4c343cb78f61b424aed9e4bffdd45aa1c6cda374 /templates
parent09d598562f66e524e24ca4b1a924a43bb89cecfc (diff)
switching logs over to partials
Diffstat (limited to 'templates')
-rw-r--r--templates/vhosts/gitweb/gitweb.erb30
-rw-r--r--templates/vhosts/perl/perl.erb60
-rw-r--r--templates/vhosts/php/php.erb60
-rw-r--r--templates/vhosts/php_drupal/php_drupal.erb60
-rw-r--r--templates/vhosts/php_gallery2/php_gallery2.erb60
-rw-r--r--templates/vhosts/php_joomla/php_joomla.erb60
-rw-r--r--templates/vhosts/php_mediawiki/php_mediawiki.erb60
-rw-r--r--templates/vhosts/php_silverstripe/php_silverstripe.erb60
-rw-r--r--templates/vhosts/php_simplemachine/php_simplemachine.erb60
-rw-r--r--templates/vhosts/php_spip/php_spip.erb60
-rw-r--r--templates/vhosts/php_typo3/php_typo3.erb60
-rw-r--r--templates/vhosts/php_wordpress/php_wordpress.erb60
-rw-r--r--templates/vhosts/proxy/proxy.erb30
-rw-r--r--templates/vhosts/redirect/redirect.erb30
-rw-r--r--templates/vhosts/static/static.erb33
-rw-r--r--templates/vhosts/webdav/webdav.erb60
16 files changed, 56 insertions, 787 deletions
diff --git a/templates/vhosts/gitweb/gitweb.erb b/templates/vhosts/gitweb/gitweb.erb
index f732eb3..61ce15f 100644
--- a/templates/vhosts/gitweb/gitweb.erb
+++ b/templates/vhosts/gitweb/gitweb.erb
@@ -11,20 +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 -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
<%- if default_charset.to_s != 'absent' then -%>
AddDefaultCharset <%= default_charset %>
<%- end -%>
@@ -82,20 +69,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 %>
<%- end -%>
diff --git a/templates/vhosts/perl/perl.erb b/templates/vhosts/perl/perl.erb
index 6e79805..61bc179 100644
--- a/templates/vhosts/perl/perl.erb
+++ b/templates/vhosts/perl/perl.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -96,20 +83,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 %>
@@ -176,20 +150,7 @@
DirectoryIndex index.htm index.html index.pl
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -273,20 +234,7 @@
<%- end -%>
ProxyPassReverse / https://127.0.0.1/
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
<%- if default_charset.to_s != 'absent' then -%>
AddDefaultCharset <%= default_charset %>
diff --git a/templates/vhosts/php/php.erb b/templates/vhosts/php/php.erb
index cbbc736..4531d9f 100644
--- a/templates/vhosts/php/php.erb
+++ b/templates/vhosts/php/php.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -99,21 +86,8 @@
<%- 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
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
- <%- end -%>
<%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
<IfModule mpm_itk_module>
AssignUserId <%= run_uid+" "+run_gid %>
@@ -181,20 +155,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -258,20 +219,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/php_drupal/php_drupal.erb b/templates/vhosts/php_drupal/php_drupal.erb
index 57bf6d9..01ba2fb 100644
--- a/templates/vhosts/php_drupal/php_drupal.erb
+++ b/templates/vhosts/php_drupal/php_drupal.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
RewriteCond %{HTTPS} !=on
@@ -120,20 +107,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 %>
@@ -224,20 +198,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -320,20 +281,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/php_gallery2/php_gallery2.erb b/templates/vhosts/php_gallery2/php_gallery2.erb
index ef2444f..db4068d 100644
--- a/templates/vhosts/php_gallery2/php_gallery2.erb
+++ b/templates/vhosts/php_gallery2/php_gallery2.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -107,20 +94,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 %>
@@ -197,20 +171,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -284,20 +245,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/php_joomla/php_joomla.erb b/templates/vhosts/php_joomla/php_joomla.erb
index c7e06d7..09d1bda 100644
--- a/templates/vhosts/php_joomla/php_joomla.erb
+++ b/templates/vhosts/php_joomla/php_joomla.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -108,20 +95,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 -%>
@@ -190,20 +164,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -278,20 +239,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/php_mediawiki/php_mediawiki.erb b/templates/vhosts/php_mediawiki/php_mediawiki.erb
index a5fd4f3..b913c10 100644
--- a/templates/vhosts/php_mediawiki/php_mediawiki.erb
+++ b/templates/vhosts/php_mediawiki/php_mediawiki.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -94,20 +81,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 -%>
@@ -172,20 +146,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -249,20 +210,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/php_silverstripe/php_silverstripe.erb b/templates/vhosts/php_silverstripe/php_silverstripe.erb
index c2d8e49..19f48d1 100644
--- a/templates/vhosts/php_silverstripe/php_silverstripe.erb
+++ b/templates/vhosts/php_silverstripe/php_silverstripe.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -118,20 +105,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 %>
@@ -216,20 +190,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -313,20 +274,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/php_simplemachine/php_simplemachine.erb b/templates/vhosts/php_simplemachine/php_simplemachine.erb
index dfe0af2..ebab10d 100644
--- a/templates/vhosts/php_simplemachine/php_simplemachine.erb
+++ b/templates/vhosts/php_simplemachine/php_simplemachine.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -93,20 +80,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 %>
@@ -169,20 +143,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -246,20 +207,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/php_spip/php_spip.erb b/templates/vhosts/php_spip/php_spip.erb
index ebd9d84..48a6774 100644
--- a/templates/vhosts/php_spip/php_spip.erb
+++ b/templates/vhosts/php_spip/php_spip.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -99,20 +86,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 %>
@@ -181,20 +155,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -258,20 +219,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/php_typo3/php_typo3.erb b/templates/vhosts/php_typo3/php_typo3.erb
index e65a5c9..1fd5a1a 100644
--- a/templates/vhosts/php_typo3/php_typo3.erb
+++ b/templates/vhosts/php_typo3/php_typo3.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -106,20 +93,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 %>
@@ -187,20 +161,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -273,20 +234,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/php_wordpress/php_wordpress.erb b/templates/vhosts/php_wordpress/php_wordpress.erb
index de889ee..9180d9a 100644
--- a/templates/vhosts/php_wordpress/php_wordpress.erb
+++ b/templates/vhosts/php_wordpress/php_wordpress.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -95,20 +82,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 %>
@@ -174,20 +148,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -251,20 +212,7 @@
DirectoryIndex index.htm index.html index.php
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
diff --git a/templates/vhosts/proxy/proxy.erb b/templates/vhosts/proxy/proxy.erb
index 885bce3..bb31b6b 100644
--- a/templates/vhosts/proxy/proxy.erb
+++ b/templates/vhosts/proxy/proxy.erb
@@ -10,20 +10,7 @@
ServerAdmin <%= server_admin %>
<%- end -%>
- <%- 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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
RewriteCond %{HTTPS} !=on
@@ -64,20 +51,7 @@
ServerAdmin <%= server_admin %>
<%- end -%>
- <%- 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') %>
Header add Strict-Transport-Security "max-age=15768000"
diff --git a/templates/vhosts/redirect/redirect.erb b/templates/vhosts/redirect/redirect.erb
index 2374797..43cfa02 100644
--- a/templates/vhosts/redirect/redirect.erb
+++ b/templates/vhosts/redirect/redirect.erb
@@ -10,20 +10,7 @@
ServerAdmin <%= server_admin %>
<%- end -%>
- <%- 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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
RewriteCond %{HTTPS} !=on
@@ -46,20 +33,7 @@
ServerAdmin <%= server_admin %>
<%- end -%>
- <%- 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') %>
Header add Strict-Transport-Security "max-age=15768000"
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 %>
diff --git a/templates/vhosts/webdav/webdav.erb b/templates/vhosts/webdav/webdav.erb
index e498833..30d76e3 100644
--- a/templates/vhosts/webdav/webdav.erb
+++ b/templates/vhosts/webdav/webdav.erb
@@ -15,20 +15,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 ssl_mode.to_s == 'force' then -%>
RewriteEngine On
@@ -99,20 +86,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 %>
@@ -177,20 +151,7 @@
ServerAdmin <%= server_admin %>
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off
@@ -228,20 +189,7 @@
ServerAdmin <%= server_admin %>
<%- end -%>
- <%- case logmode.to_s
- when 'nologs' -%>
- ErrorLog /dev/null
- CustomLog /dev/null
- <%- when 'semianonym' -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- when 'anonym' -%>
- ErrorLog /dev/null
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log noip
- <%- else -%>
- ErrorLog <%= logdir %>/<%= logfileprefix %>-error_log
- CustomLog <%= logdir %>/<%= logfileprefix %>-access_log combined
- <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
ProxyPreserveHost On
ProxyRequests off