/[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 2487 by misc, Thu Mar 15 13:52:24 2012 UTC revision 2488 by misc, Thu Mar 15 13:52:26 2012 UTC
# Line 112  class apache { Line 112  class apache {
112                        $enable_public_html = false) {                        $enable_public_html = false) {
113          include apache::base          include apache::base
114          $httpd_logdir = "/var/log/httpd"          $httpd_logdir = "/var/log/httpd"
115            $filename = "$name.conf"
116    
117          if ! $vhost {          if ! $vhost {
118              $real_vhost = $name              $real_vhost = $name
# Line 135  class apache { Line 136  class apache {
136              if $wildcard_sslcert != 'true' {              if $wildcard_sslcert != 'true' {
137                  openssl::self_signed_cert{ "$real_vhost":                  openssl::self_signed_cert{ "$real_vhost":
138                      directory => "/etc/ssl/apache/",                      directory => "/etc/ssl/apache/",
139                      before => File["$filename"],                      before => Apache::Config["/etc/httpd/conf/vhosts.d/$filename"],
140                  }                  }
141              }              }
142          }          }
# Line 144  class apache { Line 145  class apache {
145              include apache::mod_public_html              include apache::mod_public_html
146          }          }
147    
         $filename = "$name.conf"  
148          apache::config { "/etc/httpd/conf/vhosts.d/$filename":          apache::config { "/etc/httpd/conf/vhosts.d/$filename":
149              content => template("apache/vhost_base.conf")              content => template("apache/vhost_base.conf")
150          }          }

Legend:
Removed from v.2487  
changed lines
  Added in v.2488

  ViewVC Help
Powered by ViewVC 1.1.30