/[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 2688 by misc, Sun Mar 25 12:26:37 2012 UTC revision 2689 by misc, Sun Mar 25 12:47:17 2012 UTC
# Line 1  Line 1 
1  class apache {  class apache {
     define vhost_base($content = '',  
                       $location = '/dev/null',  
                       $use_ssl = false,  
                       $vhost = false,  
                       $aliases = {},  
                       $server_aliases = [],  
                       $access_logfile = false,  
                       $error_logfile = false,  
                       $options = [],  
                       $enable_public_html = false) {  
         include apache::base  
         $httpd_logdir = "/var/log/httpd"  
         $filename = "$name.conf"  
   
         if ! $vhost {  
             $real_vhost = $name  
         } else {  
             $real_vhost = $vhost  
         }  
   
         if ! $access_logfile {  
             $real_access_logfile = "$httpd_logdir/${real_vhost}-access_log"  
         } else {  
             $real_access_logfile = $access_logfile  
         }  
         if ! $error_logfile {  
             $real_error_logfile = "$httpd_logdir/${real_vhost}-error_log"  
         } else {  
             $real_error_logfile = $error_logfile  
         }  
   
         if $use_ssl {  
             include apache::mod::ssl  
             if $wildcard_sslcert != 'true' {  
                 openssl::self_signed_cert{ "$real_vhost":  
                     directory => "/etc/ssl/apache/",  
                     before => Apache::Config["/etc/httpd/conf/vhosts.d/$filename"],  
                 }  
             }  
         }  
   
         if $enable_public_html {  
             include apache::mod::public_html  
         }  
   
         apache::config { "/etc/httpd/conf/vhosts.d/$filename":  
             content => template("apache/vhost_base.conf")  
         }  
     }  
   
2      define vhost_redirect_ssl() {      define vhost_redirect_ssl() {
3          vhost_base { "redirect_ssl_$name":          apache::vhost::base { "redirect_ssl_$name":
4              vhost => $name,              vhost => $name,
5              content => template("apache/vhost_ssl_redirect.conf")              content => template("apache/vhost_ssl_redirect.conf")
6          }          }
# Line 59  class apache { Line 9  class apache {
9      define vhost_catalyst_app($script, $location = '', $process = 4, $use_ssl = false, $vhost = false) {      define vhost_catalyst_app($script, $location = '', $process = 4, $use_ssl = false, $vhost = false) {
10    
11          include apache::mod::fastcgi          include apache::mod::fastcgi
12          vhost_base { $name:          apache::vhost::base { $name:
13              vhost => $vhost,              vhost => $vhost,
14              use_ssl => $use_ssl,              use_ssl => $use_ssl,
15              content => template("apache/vhost_catalyst_app.conf"),              content => template("apache/vhost_catalyst_app.conf"),
# Line 68  class apache { Line 18  class apache {
18    
19      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= {}) {
20          include apache::mod::wsgi          include apache::mod::wsgi
21          vhost_base { $name:          apache::vhost::base { $name:
22              use_ssl => $use_ssl,              use_ssl => $use_ssl,
23              content => template("apache/vhost_django_app.conf"),              content => template("apache/vhost_django_app.conf"),
24              aliases => $aliases,              aliases => $aliases,
# Line 86  class apache { Line 36  class apache {
36    
37      define vhost_wsgi($wsgi_path, $aliases = {}, $server_aliases = []) {      define vhost_wsgi($wsgi_path, $aliases = {}, $server_aliases = []) {
38          include apache::mod::wsgi          include apache::mod::wsgi
39          vhost_base { $name:          apache::vhost::base { $name:
40              aliases => $aliases,              aliases => $aliases,
41              server_aliases => $server_aliases,              server_aliases => $server_aliases,
42              content => template("apache/vhost_wsgi.conf"),              content => template("apache/vhost_wsgi.conf"),
# Line 102  class apache { Line 52  class apache {
52    
53      define vhost_simple($location) {      define vhost_simple($location) {
54          include apache::base          include apache::base
55          vhost_base { $name:          apache::vhost::base { $name:
56              location => $location,              location => $location,
57          }          }
58      }      }
# Line 111  class apache { Line 61  class apache {
61                            $vhost = false,                            $vhost = false,
62                            $use_ssl = false) {                            $use_ssl = false) {
63          include apache::base          include apache::base
64          vhost_base { $name:          apache::vhost::base { $name:
65              use_ssl => $use_ssl,              use_ssl => $use_ssl,
66              vhost => $vhost,              vhost => $vhost,
67              content => template("apache/vhost_redirect.conf"),              content => template("apache/vhost_redirect.conf"),
# Line 122  class apache { Line 72  class apache {
72                                 $vhost = false,                                 $vhost = false,
73                                 $use_ssl = false) {                                 $use_ssl = false) {
74          include apache::mod::proxy          include apache::mod::proxy
75          vhost_base { $name:          apache::vhost::base { $name:
76              use_ssl => $use_ssl,              use_ssl => $use_ssl,
77              vhost => $vhost,              vhost => $vhost,
78              content => template("apache/vhost_reverse_proxy.conf")              content => template("apache/vhost_reverse_proxy.conf")
Legend:
Removed from v.2688  
changed lines
  Added in v.2689
  ViewVC Help
Powered by ViewVC 1.1.30