| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 cron {'update_repository_subscriptionlist': | 81 cron {'update_repository_subscriptionlist': |
| 82 ensure => present, | 82 ensure => present, |
| 83 environment => ['MAILTO=admins@adblockplus.org'], | 83 environment => ['MAILTO=admins@adblockplus.org'], |
| 84 command => "hg pull --quiet --repository $subscriptions_repo", | 84 command => "hg pull --quiet --repository $subscriptions_repo", |
| 85 user => 'sitescripts', | 85 user => 'sitescripts', |
| 86 minute => '*/10', | 86 minute => '*/10', |
| 87 require => Exec['fetch_repository_subscriptionlist'] | 87 require => Exec['fetch_repository_subscriptionlist'] |
| 88 } | 88 } |
| 89 } | 89 } |
| 90 | 90 |
| 91 node 'web3' { | |
| 92 include statsclient | |
| 93 | |
| 94 class {'web::server': | |
| 95 vhost => 'testpages.adblockplus.org', | |
| 96 certificate => 'testpages.adblockplus.org_sslcert.pem', | |
| 97 private_key => 'testpages.adblockplus.org_sslcert.key', | |
| 98 is_default => true, | |
| 99 repository => 'testpages.adblockplus.org', | |
| 100 } | |
| 101 } | |
| 102 | |
| 103 node 'web-sh-abp-org-1' { | 91 node 'web-sh-abp-org-1' { |
| 104 include statsclient | 92 include statsclient |
| 105 | 93 |
| 106 class {'web::server': | 94 class {'web::server': |
| 107 vhost => 'share.adblockplus.org', | 95 vhost => 'share.adblockplus.org', |
| 108 certificate => 'share.adblockplus.org_sslcert.pem', | 96 certificate => 'share.adblockplus.org_sslcert.pem', |
| 109 private_key => 'share.adblockplus.org_sslcert.key', | 97 private_key => 'share.adblockplus.org_sslcert.key', |
| 110 is_default => true, | 98 is_default => true, |
| 111 repository => 'share.adblockplus.org', | 99 repository => 'share.adblockplus.org', |
| 112 } | 100 } |
| (...skipping 27 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 |