Side by Side Diff: manifests/webserver.pp
Issue 29325470:
Issue 2974 - Integrate share.adblockplus.org with Hiera (Closed)
Patch Set:
Created Sept. 2, 2015, 11:04 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« hiera/roles/web/share.yaml ('k')
|
modules/private-stub/hiera/hosts.yaml » ('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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 | 93 |
| 94 class {'web::server': | 94 class {'web::server': |
| 95 vhost => 'testpages.adblockplus.org', | 95 vhost => 'testpages.adblockplus.org', |
| 96 certificate => 'testpages.adblockplus.org_sslcert.pem', | 96 certificate => 'testpages.adblockplus.org_sslcert.pem', |
| 97 private_key => 'testpages.adblockplus.org_sslcert.key', | 97 private_key => 'testpages.adblockplus.org_sslcert.key', |
| 98 is_default => true, | 98 is_default => true, |
| 99 repository => 'testpages.adblockplus.org', | 99 repository => 'testpages.adblockplus.org', |
| 100 } | 100 } |
| 101 } | 101 } |
| 102 | 102 |
| 103 node 'web-sh-abp-org-1' { | |
| 104 include statsclient | |
| 105 | |
| 106 class {'web::server': | |
| 107 vhost => 'share.adblockplus.org', | |
| 108 certificate => 'share.adblockplus.org_sslcert.pem', | |
| 109 private_key => 'share.adblockplus.org_sslcert.key', | |
| 110 is_default => true, | |
| 111 repository => 'share.adblockplus.org', | |
| 112 } | |
| 113 } | |
| 114 | |
| 115 node 'web-yt-abp-me-1' { | 103 node 'web-yt-abp-me-1' { |
| 116 include statsclient | 104 include statsclient |
| 117 | 105 |
| 118 class {'web::server': | 106 class {'web::server': |
| 119 vhost => 'youtube.adblockplus.me', | 107 vhost => 'youtube.adblockplus.me', |
| 120 certificate => 'youtube.adblockplus.me_sslcert.pem', | 108 certificate => 'youtube.adblockplus.me_sslcert.pem', |
| 121 private_key => 'youtube.adblockplus.me_sslcert.key', | 109 private_key => 'youtube.adblockplus.me_sslcert.key', |
| 122 is_default => true, | 110 is_default => true, |
| 123 repository => 'youtube.adblockplus.me', | 111 repository => 'youtube.adblockplus.me', |
| 124 } | 112 } |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 140 include statsclient | 128 include statsclient |
| 141 | 129 |
| 142 class {'web::server': | 130 class {'web::server': |
| 143 vhost => 'acceptableads.org', | 131 vhost => 'acceptableads.org', |
| 144 certificate => 'acceptableads.org_sslcert.pem', | 132 certificate => 'acceptableads.org_sslcert.pem', |
| 145 private_key => 'acceptableads.org_sslcert.key', | 133 private_key => 'acceptableads.org_sslcert.key', |
| 146 is_default => true, | 134 is_default => true, |
| 147 repository => 'web.acceptableads.org', | 135 repository => 'web.acceptableads.org', |
| 148 } | 136 } |
| 149 } | 137 } |
| OLD | NEW |
« no previous file with comments
|
« hiera/roles/web/share.yaml ('k')
|
modules/private-stub/hiera/hosts.yaml » ('j')
|
no next file with comments »
