Side by Side Diff: manifests/webserver.pp
Issue 5558333301850112:
Removed erroneous indentation in sitescripts.ini on web1 (Closed)
Patch Set:
Created Feb. 17, 2014, 3: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
|
no next file »
|
no next file with comments »
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 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 => ' | 18 content => '[DEFAULT] |
| 19 [DEFAULT] | 19 mailer=/usr/sbin/sendmail |
| 20 mailer=/usr/sbin/sendmail | 20 [formmail] |
| 21 [formmail] | 21 template=formmail/template/eyeo.mail', |
| 22 template=formmail/template/eyeo.mail | |
| 23 ', | |
| 24 } | 22 } |
| 25 | 23 |
| 26 class {'nagios::client': | 24 class {'nagios::client': |
| 27 server_address => 'monitoring.adblockplus.org' | 25 server_address => 'monitoring.adblockplus.org' |
| 28 } | 26 } |
| 29 } | 27 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
