Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: manifests/webserver.pp

Issue 5778562212691968: Added redirects for legacy URLs to eyeo.com configuration and added host name aliases (Closed)
Patch Set: Created Jan. 14, 2014, 10:41 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | modules/web/manifests/server.pp » ('j') | modules/web/templates/site.erb » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 }
OLDNEW
« no previous file with comments | « no previous file | modules/web/manifests/server.pp » ('j') | modules/web/templates/site.erb » ('J')

Powered by Google App Engine
This is Rietveld