| OLD | NEW | 
|---|
| 1 class web::server( | 1 class web::server( | 
| 2     $vhost, | 2     $vhost, | 
| 3     $repository, | 3     $repository, | 
| 4     $certificate = hiera('web::server::certificate', 'undef'), | 4     $certificate = hiera('web::server::certificate', 'undef'), | 
| 5     $private_key = hiera('web::server::private_key', 'undef'), | 5     $private_key = hiera('web::server::private_key', 'undef'), | 
| 6     $is_default = false, | 6     $is_default = false, | 
| 7     $aliases = undef, | 7     $aliases = undef, | 
| 8     $custom_config = undef, | 8     $custom_config = undef, | 
| 9     $multiplexer_locations = undef, | 9     $multiplexer_locations = undef, | 
| 10     $geoip = false, | 10     $geoip = false, | 
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 70     certificate => $certificate ? {'undef' => undef, default => $certificate}, | 70     certificate => $certificate ? {'undef' => undef, default => $certificate}, | 
| 71     private_key => $private_key ? {'undef' => undef, default => $private_key}, | 71     private_key => $private_key ? {'undef' => undef, default => $private_key}, | 
| 72     log => "access_log_$vhost" | 72     log => "access_log_$vhost" | 
| 73   } | 73   } | 
| 74 | 74 | 
| 75   sitescripts::configfragment {$title: | 75   sitescripts::configfragment {$title: | 
| 76     source => 'puppet:///modules/web/sitescripts', | 76     source => 'puppet:///modules/web/sitescripts', | 
| 77   } | 77   } | 
| 78 | 78 | 
| 79   if $multiplexer_locations != undef { | 79   if $multiplexer_locations != undef { | 
| 80     include spawn-fcgi | 80     include spawn_fcgi | 
| 81 | 81 | 
| 82     spawn-fcgi::pool {"multiplexer": | 82     spawn_fcgi::pool {"multiplexer": | 
| 83       ensure => present, | 83       ensure => present, | 
| 84       fcgi_app => '/opt/sitescripts/multiplexer.fcgi', | 84       fcgi_app => '/opt/sitescripts/multiplexer.fcgi', | 
| 85       socket => '/tmp/multiplexer-fastcgi.sock', | 85       socket => '/tmp/multiplexer-fastcgi.sock', | 
| 86       mode => '0666', | 86       mode => '0666', | 
| 87       user => 'nginx', | 87       user => 'nginx', | 
| 88       children => 1, | 88       children => 1, | 
| 89       require => [ | 89       require => [ | 
| 90         Class["sitescripts"], | 90         Class["sitescripts"], | 
| 91       ], | 91       ], | 
| 92     } | 92     } | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 187   ) | 187   ) | 
| 188 | 188 | 
| 189   cron {'update_repo': | 189   cron {'update_repo': | 
| 190     ensure => present, | 190     ensure => present, | 
| 191     command => $update_webpage_cmd, | 191     command => $update_webpage_cmd, | 
| 192     user => www, | 192     user => www, | 
| 193     minute  => '5-59/20', | 193     minute  => '5-59/20', | 
| 194   } | 194   } | 
| 195 | 195 | 
| 196 } | 196 } | 
| OLD | NEW | 
|---|