| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 private_key => $private_key ? {'undef' => undef, default => $private_key}, | 69 private_key => $private_key ? {'undef' => undef, default => $private_key}, |
| 70 log => "access_log_$vhost" | 70 log => "access_log_$vhost" |
| 71 } | 71 } |
| 72 | 72 |
| 73 sitescripts::configfragment {$title: | 73 sitescripts::configfragment {$title: |
| 74 source => 'puppet:///modules/web/sitescripts', | 74 source => 'puppet:///modules/web/sitescripts', |
| 75 } | 75 } |
| 76 | 76 |
| 77 if $multiplexer_locations != undef { | 77 if $multiplexer_locations != undef { |
| 78 include spawn-fcgi | 78 include spawn-fcgi |
| 79 package {'python-flup':} | |
| 80 | 79 |
| 81 spawn-fcgi::pool {"multiplexer": | 80 spawn-fcgi::pool {"multiplexer": |
| 82 ensure => present, | 81 ensure => present, |
| 83 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', | 82 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', |
| 84 socket => '/tmp/multiplexer-fastcgi.sock', | 83 socket => '/tmp/multiplexer-fastcgi.sock', |
| 85 mode => '0666', | 84 mode => '0666', |
| 86 user => 'nginx', | 85 user => 'nginx', |
| 87 children => 1, | 86 children => 1, |
| 88 require => [ | 87 require => [ |
| 89 Class["sitescripts"], | 88 Class["sitescripts"], |
| 90 Package["python-flup"], | |
| 91 ], | 89 ], |
| 92 } | 90 } |
| 93 } | 91 } |
| 94 | 92 |
| 95 user {'www': | 93 user {'www': |
| 96 ensure => present, | 94 ensure => present, |
| 97 comment => 'Web content owner', | 95 comment => 'Web content owner', |
| 98 home => '/home/www', | 96 home => '/home/www', |
| 99 managehome => true, | 97 managehome => true, |
| 100 } | 98 } |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 Class['sitescripts'], | 173 Class['sitescripts'], |
| 176 Exec['install_jsdoc'], | 174 Exec['install_jsdoc'], |
| 177 Package['make', 'doxygen'], | 175 Package['make', 'doxygen'], |
| 178 File['/var/www/docs'], | 176 File['/var/www/docs'], |
| 179 ], | 177 ], |
| 180 command => 'python -m sitescripts.docs.bin.generate_docs', | 178 command => 'python -m sitescripts.docs.bin.generate_docs', |
| 181 user => www, | 179 user => www, |
| 182 minute => '5-55/10', | 180 minute => '5-55/10', |
| 183 } | 181 } |
| 184 } | 182 } |
| OLD | NEW |