Skip to content
Browse files

Add template comment and formatting for apache::vhost

  • Loading branch information...
1 parent d136df6 commit 3b694f2c227df27a669c92fd9ead0b68b14d815a @hunner committed Dec 12, 2012
Showing with 14 additions and 2 deletions.
  1. +12 −0 manifests/vhost.pp
  2. +2 −2 templates/vhost-default.conf.erb
View
12 manifests/vhost.pp
@@ -98,6 +98,18 @@
}
}
+ # Template uses:
+ # - $vhost_name
+ # - $port
+ # - $srvname
+ # - $serveradmin
+ # - $serveraliases
+ # - $docroot
+ # - $options
+ # - $override
+ # - $logroot
+ # - $access_log
+ # - $name
file { "${priority}-${name}.conf":
ensure => $ensure,
path => "${apache::params::vdir}/${priority}-${name}.conf",
View
4 templates/vhost-default.conf.erb
@@ -23,9 +23,9 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
</Directory>
ErrorLog <%= logroot %>/<%= name %>_error.log
LogLevel warn
-<% if access_log %>
+<% if access_log -%>
CustomLog <%= logroot %>/<%= name %>_access.log combined
-<% end %>
+<% end -%>
ServerSignature Off
</VirtualHost>

0 comments on commit 3b694f2

Please sign in to comment.
Something went wrong with that request. Please try again.