OLD | NEW |
1 class web::server( | 1 class web::server( |
2 $vhost, | 2 $vhost, |
3 $repository, | 3 $repository, |
| 4 $certificate, |
| 5 $private_key, |
4 $is_default = false, | 6 $is_default = false, |
5 $aliases = undef, | 7 $aliases = undef, |
6 $custom_config = undef, | 8 $custom_config = undef, |
7 $multiplexer_locations = undef) { | 9 $multiplexer_locations = undef) { |
8 File { | 10 File { |
9 owner => 'root', | 11 owner => 'root', |
10 group => 'root', | 12 group => 'root', |
11 mode => 0644, | 13 mode => 0644, |
12 } | 14 } |
13 | 15 |
14 Cron { | 16 Cron { |
15 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript
s'], | 17 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript
s'], |
16 } | 18 } |
17 | 19 |
18 include nginx | 20 include nginx |
19 | 21 |
20 package {['python-jinja2', 'python-markdown']:} | 22 package {['python-jinja2', 'python-markdown']:} |
21 | 23 |
22 nginx::hostconfig {$vhost: | 24 nginx::hostconfig {$vhost: |
23 content => template('web/site.conf.erb'), | 25 content => template('web/site.conf.erb'), |
24 global_config => template('web/global.conf.erb'), | 26 global_config => template('web/global.conf.erb'), |
25 is_default => $is_default, | 27 is_default => $is_default, |
26 certificate => 'adblockplus.org_sslcert.pem', | 28 certificate => $certificate, |
27 private_key => 'adblockplus.org_sslcert.key', | 29 private_key => $private_key, |
28 log => "access_log_$vhost" | 30 log => "access_log_$vhost" |
29 } | 31 } |
30 | 32 |
31 class {'sitescripts': | 33 class {'sitescripts': |
32 sitescriptsini_source => 'puppet:///modules/web/sitescripts', | 34 sitescriptsini_source => 'puppet:///modules/web/sitescripts', |
33 } | 35 } |
34 | 36 |
35 if $multiplexer_locations != undef { | 37 if $multiplexer_locations != undef { |
36 include spawn-fcgi | 38 include spawn-fcgi |
37 package {['python-flup', 'python-mysqldb']:} | 39 package {['python-flup', 'python-mysqldb']:} |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 mode => 755, | 80 mode => 755, |
79 } | 81 } |
80 | 82 |
81 cron {'update_repo': | 83 cron {'update_repo': |
82 ensure => present, | 84 ensure => present, |
83 command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.c
ms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}", | 85 command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.c
ms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}", |
84 user => www, | 86 user => www, |
85 minute => '*/10', | 87 minute => '*/10', |
86 } | 88 } |
87 } | 89 } |
OLD | NEW |