| 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, |
| 7 aliases => ['www.eyeo.com', 'eyeo.de', 'www.eyeo.de'], |
| 8 custom_config => ' |
| 9 rewrite ^(/de)?/index\.html$ / permanent; |
| 10 rewrite ^(/de)?/job\.html$ /jobs permanent; |
| 11 ', |
| 6 repository => 'web.eyeo.com', | 12 repository => 'web.eyeo.com', |
| 7 multiplexer_locations => ['/formmail'], | 13 multiplexer_locations => ['/formmail'], |
| 8 } | 14 } |
| 9 | 15 |
| 10 concat::fragment {'formmail_template': | 16 concat::fragment {'formmail_template': |
| 11 target => '/etc/sitescripts.ini', | 17 target => '/etc/sitescripts.ini', |
| 12 content => "[DEFAULT]\nmailer=/usr/sbin/sendmail\n[formmail]\ntemplate=formm
ail/template/eyeo.mail\n", | 18 content => ' |
| 19 [DEFAULT] |
| 20 mailer=/usr/sbin/sendmail |
| 21 [formmail] |
| 22 template=formmail/template/eyeo.mail |
| 23 ', |
| 13 } | 24 } |
| 14 | 25 |
| 15 class {'nagios::client': | 26 class {'nagios::client': |
| 16 server_address => 'monitoring.adblockplus.org' | 27 server_address => 'monitoring.adblockplus.org' |
| 17 } | 28 } |
| 18 } | 29 } |
| OLD | NEW |