Side by Side Diff: manifests/webserver.pp
Issue 6484340657618944:
Issue 2168 - Unbreak web2 configuration (Closed)
Patch Set:
Created March 18, 2015, 8:16 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
modules/private-stub/hiera/hosts.yaml » ('j')
|
modules/private-stub/hiera/hosts.yaml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 node 'web1' { | 1 node 'web1' { |
| 2 include statsclient | 2 include statsclient |
| 3 | 3 |
| 4 class {'web::server': | 4 class {'web::server': |
| 5 vhost => 'eyeo.com', | 5 vhost => 'eyeo.com', |
| 6 certificate => 'eyeo.com_sslcert.pem', | 6 certificate => 'eyeo.com_sslcert.pem', |
| 7 private_key => 'eyeo.com_sslcert.key', | 7 private_key => 'eyeo.com_sslcert.key', |
| 8 is_default => true, | 8 is_default => true, |
| 9 aliases => ['www.eyeo.com', 'eyeo.de', 'www.eyeo.de'], | 9 aliases => ['www.eyeo.com', 'eyeo.de', 'www.eyeo.de'], |
| 10 custom_config => ' | 10 custom_config => ' |
| 11 rewrite ^(/de)?/index\.html$ / permanent; | 11 rewrite ^(/de)?/index\.html$ / permanent; |
| 12 rewrite ^(/de)?/job\.html$ /jobs permanent; | 12 rewrite ^(/de)?/job\.html$ /jobs permanent; |
| 13 ', | 13 ', |
| 14 repository => 'web.eyeo.com', | 14 repository => 'web.eyeo.com', |
| 15 multiplexer_locations => ['/formmail'], | 15 multiplexer_locations => ['/formmail'], |
| 16 } | 16 } |
| 17 | 17 |
| 18 concat::fragment {'formmail_template': | 18 concat::fragment {'formmail_template': |
| 19 target => '/etc/sitescripts.ini', | 19 target => '/etc/sitescripts.ini', |
| 20 content => '[DEFAULT] | 20 content => '[DEFAULT] |
| 21 mailer=/usr/sbin/sendmail | 21 mailer=/usr/sbin/sendmail |
| 22 [multiplexer] | 22 [multiplexer] |
| 23 sitescripts.formmail.web.formmail = | 23 sitescripts.formmail.web.formmail = |
| 24 [formmail] | 24 [formmail] |
| 25 template=formmail/template/eyeo.mail', | 25 template=formmail/template/eyeo.mail', |
| 26 } | 26 } |
| 27 } | 27 } |
| 28 | 28 |
| 29 node 'web2' { | 29 node 'web2' { |
| 30 include base, statsclient | 30 include statsclient |
| 31 | 31 |
| 32 class {'web::server': | 32 class {'web::server': |
| 33 vhost => 'beta.adblockplus.org', | 33 vhost => 'beta.adblockplus.org', |
| 34 certificate => 'beta.adblockplus.org_sslcert.pem', | 34 certificate => 'beta.adblockplus.org_sslcert.pem', |
| 35 private_key => 'beta.adblockplus.org_sslcert.key', | 35 private_key => 'beta.adblockplus.org_sslcert.key', |
| 36 is_default => true, | 36 is_default => true, |
| 37 repository => 'web.adblockplus.org', | 37 repository => 'web.adblockplus.org', |
| 38 # Hack: This server doesn't need multiplexer but it needs sitescripts | 38 # Hack: This server doesn't need multiplexer but it needs sitescripts |
| 39 multiplexer_locations => [], | 39 multiplexer_locations => [], |
| 40 } | 40 } |
| 41 | |
| 42 class {'nagios::client': | |
| 43 server_address => 'monitoring.adblockplus.org' | |
| 44 } | |
| 45 } | 41 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
modules/private-stub/hiera/hosts.yaml » ('j')
|
modules/private-stub/hiera/hosts.yaml » ('J')
