diff options
| author | mh <mh@immerda.ch> | 2013-03-10 16:46:51 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-03-10 16:46:51 +0100 |
| commit | 966956844377b8aa28dba04a7460678b3d73730b (patch) | |
| tree | fcc9e9d48eee85df99f9f9aa7f5f8312b91a82f2 | |
| parent | e1b1157e3515657763b3e89f0c52235107e1899d (diff) | |
introduce logprefix
| -rw-r--r-- | manifests/vhost/template.pp | 1 | ||||
| -rw-r--r-- | templates/vhosts/partials/logs.erb | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index 4c9ab3f..6187368 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -46,6 +46,7 @@ define apache::vhost::template( $path_is_webdir = false, $logpath = 'absent', $logmode = 'default', + $logprefix = '', $domain = 'absent', $domainalias = 'absent', $server_admin = 'absent', diff --git a/templates/vhosts/partials/logs.erb b/templates/vhosts/partials/logs.erb index 650b204..68403a8 100644 --- a/templates/vhosts/partials/logs.erb +++ b/templates/vhosts/partials/logs.erb @@ -3,12 +3,12 @@ ErrorLog /dev/null CustomLog /dev/null <% when 'semianonym' -%> - ErrorLog <%= logdir %>/error_log - CustomLog <%= logdir %>/access_log noip + ErrorLog <%= logdir %>/<%= logprefix %>error_log + CustomLog <%= logdir %>/<%= logprefix %>access_log noip <% when 'anonym' -%> ErrorLog /dev/null - CustomLog <%= logdir %>/access_log noip + CustomLog <%= logdir %>/<%= logprefix %>access_log noip <% else -%> - ErrorLog <%= logdir %>/error_log - CustomLog <%= logdir %>/access_log combined + ErrorLog <%= logdir %>/<%= logprefix %>error_log + CustomLog <%= logdir %>/<%= logprefix %>access_log combined <% end -%> |