/[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 934 by misc, Tue Feb 1 12:45:01 2011 UTC revision 935 by misc, Tue Feb 1 12:45:03 2011 UTC
# Line 107  class apache { Line 107  class apache {
107                        $use_ssl = false,                        $use_ssl = false,
108                        $vhost = false,                        $vhost = false,
109                        $aliases = {},                        $aliases = {},
110                          $server_aliases = [],
111                        $enable_public_html = false) {                        $enable_public_html = false) {
112          if ! $vhost {          if ! $vhost {
113              $real_vhost = $name              $real_vhost = $name
# Line 174  class apache { Line 175  class apache {
175          }          }
176      }      }
177    
178      define vhost_wsgi($wsgi_path, $aliases = {}) {      define vhost_wsgi($wsgi_path, $aliases = {}, $server_aliases = []) {
179          include apache::mod_wsgi          include apache::mod_wsgi
180          vhost_base { $name:          vhost_base { $name:
181              aliases => $aliases,              aliases => $aliases,
182                server_aliases => $server_aliases,
183              content => template("apache/vhost_wsgi.conf")              content => template("apache/vhost_wsgi.conf")
184          }          }
185      }      }
Legend:
Removed from v.934  
changed lines
  Added in v.935
  ViewVC Help
Powered by ViewVC 1.1.30