/[adm]/puppet/modules/apache/manifests/init.pp
ViewVC logotype

Diff of /puppet/modules/apache/manifests/init.pp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1617 by boklm, Thu May 19 10:07:12 2011 UTC revision 1630 by boklm, Tue May 24 09:07:42 2011 UTC
# Line 2  class apache { Line 2  class apache {
2    
3      class base {      class base {
4          $php_date_timezone = "UTC"          $php_date_timezone = "UTC"
5            $httpd_logdir = "/var/log/httpd"
6    
7          package { "apache-mpm-prefork":          package { "apache-mpm-prefork":
8              alias => apache,              alias => apache,
# Line 145  class apache { Line 146  class apache {
146                        $vhost = false,                        $vhost = false,
147                        $aliases = {},                        $aliases = {},
148                        $server_aliases = [],                        $server_aliases = [],
149                          $access_logfile = false,
150                          $error_logfile = false,
151                        $options = [],                        $options = [],
152                        $enable_public_html = false) {                        $enable_public_html = false) {
153          include apache::base          include apache::base
# Line 154  class apache { Line 157  class apache {
157              $real_vhost = $vhost              $real_vhost = $vhost
158          }          }
159    
160            if ! $access_logfile {
161                $access_logfile = $httpd_logdir/access_log-$real_vhost
162            }
163            if ! $error_logfile {
164                $error_logfile = $httpd_logdir/error_log-$real_vhost
165            }
166    
167          if $use_ssl {          if $use_ssl {
168              include apache::mod_ssl              include apache::mod_ssl
169              if $wildcard_sslcert != 'true' {              if $wildcard_sslcert != 'true' {
Legend:
Removed from v.1617  
changed lines
  Added in v.1630
  ViewVC Help
Powered by ViewVC 1.1.30