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

Side by Side Diff: manifests/webserver.pp

Issue 5889762565029888: Issue 2104 - Set up a test server for adblockplus.org content (Closed)
Patch Set: Created March 13, 2015, 3:56 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 node 'web1' { 1 node 'web1' {
2 include base, statsclient 2 include base, 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 => '
(...skipping 11 matching lines...) Expand all
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 class {'nagios::client': 28 class {'nagios::client':
29 server_address => 'monitoring.adblockplus.org' 29 server_address => 'monitoring.adblockplus.org'
30 } 30 }
31 } 31 }
32
33 node 'web2' {
Felix Dahlke 2015/03/13 16:24:10 It's fine by me for now, but we should probably fi
34 include base, statsclient
35
36 class {'web::server':
37 vhost => 'beta.adblockplus.org',
38 certificate => 'beta.adblockplus.org_sslcert.pem',
39 private_key => 'beta.adblockplus.org_sslcert.key',
40 is_default => true,
41 repository => 'web.adblockplus.org',
42 # Hack: This server doesn't need multiplexer but it needs sitescripts
43 multiplexer_locations => [],
44 }
45
46 class {'nagios::client':
47 server_address => 'monitoring.adblockplus.org'
48 }
49 }
OLDNEW

Powered by Google App Engine
This is Rietveld