/[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 2685 by misc, Sun Mar 25 12:20:29 2012 UTC revision 2686 by misc, Sun Mar 25 12:20:35 2012 UTC
# Line 35  class apache { Line 35  class apache {
35          }          }
36      }      }
37            
38      class mod_wsgi inherits base {    
         package { "apache-mod_wsgi": }  
   
         file { "/usr/local/lib/wsgi":  
             ensure => directory,  
         }  
   
         apache::config { "/etc/httpd/conf.d/mod_wsgi.conf":  
             content => template('apache/mod_wsgi.conf'),  
         }  
     }  
   
   
39      define vhost_base($content = '',      define vhost_base($content = '',
40                        $location = '/dev/null',                        $location = '/dev/null',
41                        $use_ssl = false,                        $use_ssl = false,
# Line 116  class apache { Line 104  class apache {
104      }      }
105    
106      define vhost_django_app($module = false, $module_path = false, $use_ssl = false, $aliases= {}) {      define vhost_django_app($module = false, $module_path = false, $use_ssl = false, $aliases= {}) {
107          include apache::mod_wsgi          include apache::mod::wsgi
108          vhost_base { $name:          vhost_base { $name:
109              use_ssl => $use_ssl,              use_ssl => $use_ssl,
110              content => template("apache/vhost_django_app.conf"),              content => template("apache/vhost_django_app.conf"),
# Line 134  class apache { Line 122  class apache {
122      }      }
123    
124      define vhost_wsgi($wsgi_path, $aliases = {}, $server_aliases = []) {      define vhost_wsgi($wsgi_path, $aliases = {}, $server_aliases = []) {
125          include apache::mod_wsgi          include apache::mod::wsgi
126          vhost_base { $name:          vhost_base { $name:
127              aliases => $aliases,              aliases => $aliases,
128              server_aliases => $server_aliases,              server_aliases => $server_aliases,

Legend:
Removed from v.2685  
changed lines
  Added in v.2686

  ViewVC Help
Powered by ViewVC 1.1.28