/[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 929 by misc, Tue Feb 1 12:44:52 2011 UTC revision 930 by misc, Tue Feb 1 12:44:53 2011 UTC
# Line 105  class apache { Line 105  class apache {
105      define vhost_base($content = '',      define vhost_base($content = '',
106                        $location = '/dev/null',                        $location = '/dev/null',
107                        $use_ssl = false,                        $use_ssl = false,
108                        $vhost = false) {                        $vhost = false,
109                          $enable_public_html = false) {
110          if ! $vhost {          if ! $vhost {
111              $real_vhost = $name              $real_vhost = $name
112          } else {          } else {
# Line 120  class apache { Line 121  class apache {
121              }              }
122          }          }
123    
124            if $enable_public_html {
125                include apache::mod_public_html
126            }
127    
128          $filename = "$name.conf"          $filename = "$name.conf"
129          file { "$filename":          file { "$filename":
130              path => "/etc/httpd/conf/vhosts.d/$filename",              path => "/etc/httpd/conf/vhosts.d/$filename",
Legend:
Removed from v.929  
changed lines
  Added in v.930
  ViewVC Help
Powered by ViewVC 1.1.30