| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 | 68 |
| 69 nginx::hostconfig {$vhost: | 69 nginx::hostconfig {$vhost: |
| 70 content => template('web/site.conf.erb'), | 70 content => template('web/site.conf.erb'), |
| 71 global_config => template('web/global.conf.erb'), | 71 global_config => template('web/global.conf.erb'), |
| 72 is_default => $is_default, | 72 is_default => $is_default, |
| 73 certificate => $certificate ? {'undef' => undef, default => $certificate}, | 73 certificate => $certificate ? {'undef' => undef, default => $certificate}, |
| 74 private_key => $private_key ? {'undef' => undef, default => $private_key}, | 74 private_key => $private_key ? {'undef' => undef, default => $private_key}, |
| 75 log => "access_log_$vhost" | 75 log => "access_log_$vhost" |
| 76 } | 76 } |
| 77 | 77 |
| 78 sitescripts::configfragment {$title: | |
| 79 source => 'puppet:///modules/web/sitescripts', | |
| 80 } | |
| 81 | |
| 82 if $multiplexer_locations != undef { | 78 if $multiplexer_locations != undef { |
| 83 include spawn_fcgi | 79 include spawn_fcgi |
| 84 | 80 |
| 85 spawn_fcgi::pool {"multiplexer": | 81 spawn_fcgi::pool {"multiplexer": |
| 86 ensure => present, | 82 ensure => present, |
| 87 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', | 83 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', |
| 88 socket => '/tmp/multiplexer-fastcgi.sock', | 84 socket => '/tmp/multiplexer-fastcgi.sock', |
| 89 mode => '0666', | 85 mode => '0666', |
| 90 user => 'nginx', | 86 user => 'nginx', |
| 91 children => 1, | 87 children => 1, |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 ) | 181 ) |
| 186 | 182 |
| 187 cron {'update_repo': | 183 cron {'update_repo': |
| 188 ensure => present, | 184 ensure => present, |
| 189 command => $update_webpage_cmd, | 185 command => $update_webpage_cmd, |
| 190 user => www, | 186 user => www, |
| 191 minute => '5-59/20', | 187 minute => '5-59/20', |
| 192 } | 188 } |
| 193 | 189 |
| 194 } | 190 } |
| OLD | NEW |