Side by Side Diff: manifests/webserver.pp
Issue 29326153:
Issue 3011 - Integrate GeoIP with Nginx configuration (Closed)
Patch Set:
Created Sept. 8, 2015, 6:19 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/nginx/manifests/init.pp » ('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 'web2' { | 1 node 'web2' { |
| 2 include statsclient | 2 include statsclient |
| 3 | 3 |
| 4 class {'web::server': | 4 class {'web::server': |
| 5 vhost => 'adblockplus.org', | 5 vhost => 'adblockplus.org', |
| 6 certificate => 'adblockplus.org_sslcert.pem', | 6 certificate => 'adblockplus.org_sslcert.pem', |
| 7 private_key => 'adblockplus.org_sslcert.key', | 7 private_key => 'adblockplus.org_sslcert.key', |
| 8 is_default => true, | 8 is_default => true, |
| 9 aliases => ['www.adblockplus.org'], | 9 aliases => ['www.adblockplus.org'], |
| 10 custom_config => template('web/adblockplus.org.conf.erb'), | 10 custom_config => template('web/adblockplus.org.conf.erb'), |
| 11 repository => 'web.adblockplus.org', | 11 repository => 'web.adblockplus.org', |
| 12 multiplexer_locations => ['/getSubscription'], | 12 multiplexer_locations => ['/getSubscription'], |
| 13 geoip => true, | |
| 13 } | 14 } |
| 14 | 15 |
| 15 $sitescripts_var_dir = '/var/lib/sitescripts' | 16 $sitescripts_var_dir = '/var/lib/sitescripts' |
| 16 $subscriptions_repo = "${sitescripts_var_dir}/subscriptionlist" | 17 $subscriptions_repo = "${sitescripts_var_dir}/subscriptionlist" |
| 17 | 18 |
| 18 concat::fragment {'formmail_template': | 19 concat::fragment {'formmail_template': |
| 19 target => '/etc/sitescripts.ini', | 20 target => '/etc/sitescripts.ini', |
| 20 content => " | 21 content => " |
| 21 [multiplexer] | 22 [multiplexer] |
| 22 sitescripts.subscriptions.web.fallback = | 23 sitescripts.subscriptions.web.fallback = |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 47 | 48 |
| 48 cron {'update_repository_subscriptionlist': | 49 cron {'update_repository_subscriptionlist': |
| 49 ensure => present, | 50 ensure => present, |
| 50 environment => ['MAILTO=admins@adblockplus.org'], | 51 environment => ['MAILTO=admins@adblockplus.org'], |
| 51 command => "hg pull --quiet --repository $subscriptions_repo", | 52 command => "hg pull --quiet --repository $subscriptions_repo", |
| 52 user => 'sitescripts', | 53 user => 'sitescripts', |
| 53 minute => '*/10', | 54 minute => '*/10', |
| 54 require => Exec['fetch_repository_subscriptionlist'] | 55 require => Exec['fetch_repository_subscriptionlist'] |
| 55 } | 56 } |
| 56 } | 57 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
modules/nginx/manifests/init.pp » ('j')
|
no next file with comments »
