Side by Side Diff: manifests/webserver.pp
Issue 6488936507506688:
Issue 2498 - Install proper certificate on beta.adblockplus.org (Closed)
Patch Set:
Created May 12, 2015, 2:38 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/files/adblockplus.org_sslcert.key » ('j')
|
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 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 => ' |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 sitescripts.formmail.web.formmail = | 28 sitescripts.formmail.web.formmail = |
| 29 [formmail] | 29 [formmail] |
| 30 template=formmail/template/eyeo.mail', | 30 template=formmail/template/eyeo.mail', |
| 31 } | 31 } |
| 32 } | 32 } |
| 33 | 33 |
| 34 node 'web2' { | 34 node 'web2' { |
| 35 include statsclient | 35 include statsclient |
| 36 | 36 |
| 37 class {'web::server': | 37 class {'web::server': |
| 38 vhost => 'beta.adblockplus.org', | 38 vhost => 'adblockplus.org', |
| 39 certificate => 'beta.adblockplus.org_sslcert.pem', | 39 certificate => 'adblockplus.org_sslcert.pem', |
| 40 private_key => 'beta.adblockplus.org_sslcert.key', | 40 private_key => 'adblockplus.org_sslcert.key', |
| 41 is_default => true, | 41 is_default => true, |
| 42 aliases => ['www.adblockplus.org'], | |
| 42 custom_config => template('web/adblockplus.org.conf.erb'), | 43 custom_config => template('web/adblockplus.org.conf.erb'), |
| 43 repository => 'web.adblockplus.org', | 44 repository => 'web.adblockplus.org', |
| 44 multiplexer_locations => ['/getSubscription'], | 45 multiplexer_locations => ['/getSubscription'], |
| 45 } | 46 } |
| 46 | 47 |
| 47 $sitescripts_var_dir = '/var/lib/sitescripts' | 48 $sitescripts_var_dir = '/var/lib/sitescripts' |
| 48 $subscriptions_repo = "${sitescripts_var_dir}/subscriptionlist" | 49 $subscriptions_repo = "${sitescripts_var_dir}/subscriptionlist" |
| 49 | 50 |
| 50 concat::fragment {'formmail_template': | 51 concat::fragment {'formmail_template': |
| 51 target => '/etc/sitescripts.ini', | 52 target => '/etc/sitescripts.ini', |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 139 include statsclient | 140 include statsclient |
| 140 | 141 |
| 141 class {'web::server': | 142 class {'web::server': |
| 142 vhost => 'acceptableads.org', | 143 vhost => 'acceptableads.org', |
| 143 certificate => 'acceptableads.org_sslcert.pem', | 144 certificate => 'acceptableads.org_sslcert.pem', |
| 144 private_key => 'acceptableads.org_sslcert.key', | 145 private_key => 'acceptableads.org_sslcert.key', |
| 145 is_default => true, | 146 is_default => true, |
| 146 repository => 'web.acceptableads.org', | 147 repository => 'web.acceptableads.org', |
| 147 } | 148 } |
| 148 } | 149 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
modules/private-stub/files/adblockplus.org_sslcert.key » ('j')
|
no next file with comments »
