OLD | NEW |
1 node 'web1' { | 1 node 'web1' { |
2 include base | 2 include base |
3 | 3 |
4 class {'web::server': | 4 class {'web::server': |
5 vhost => 'eyeo.com', | 5 vhost => 'eyeo.com', |
6 is_default => true, | 6 is_default => true, |
7 aliases => ['www.eyeo.com', 'eyeo.de', 'www.eyeo.de'], | 7 aliases => ['www.eyeo.com', 'eyeo.de', 'www.eyeo.de'], |
8 custom_config => ' | 8 custom_config => ' |
9 rewrite ^(/de)?/index\.html$ / permanent; | 9 rewrite ^(/de)?/index\.html$ / permanent; |
10 rewrite ^(/de)?/job\.html$ /jobs permanent; | 10 rewrite ^(/de)?/job\.html$ /jobs permanent; |
11 ', | 11 ', |
12 repository => 'web.eyeo.com', | 12 repository => 'web.eyeo.com', |
13 multiplexer_locations => ['/formmail'], | 13 multiplexer_locations => ['/formmail'], |
14 } | 14 } |
15 | 15 |
16 concat::fragment {'formmail_template': | 16 concat::fragment {'formmail_template': |
17 target => '/etc/sitescripts.ini', | 17 target => '/etc/sitescripts.ini', |
18 content => '[DEFAULT] | 18 content => ' |
19 mailer=/usr/sbin/sendmail | 19 [DEFAULT] |
20 [formmail] | 20 mailer=/usr/sbin/sendmail |
21 template=formmail/template/eyeo.mail', | 21 [formmail] |
| 22 template=formmail/template/eyeo.mail |
| 23 ', |
22 } | 24 } |
23 | 25 |
24 class {'nagios::client': | 26 class {'nagios::client': |
25 server_address => 'monitoring.adblockplus.org' | 27 server_address => 'monitoring.adblockplus.org' |
26 } | 28 } |
27 } | 29 } |
OLD | NEW |