Delta Between Two Patch Sets: modules/adblockplus/manifests/legacy/webserver.pp
Issue 29490707:
#2007 - Add nginx GeoIP module for adblockplus (Closed)
Left Patch Set:
Created July 17, 2017, 7:34 p.m.
Right Patch Set: Moving the resource into the legace module
Created July 20, 2017, 4:40 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« no previous file
|
no next file »
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 1 # == Class: adblockplus::legacy::webserver | 1 # == Class: adblockplus::legacy::webserver |
| 2 # | 2 # |
| 3 # A container for migrating obsolete resources in web2, formerly located | 3 # A container for migrating obsolete resources in web2, formerly located |
| 4 # in manifests/webserver.pp. | 4 # in manifests/webserver.pp. |
| 5 # | 5 # |
| 6 # See http://hub.eyeo.com/issues/2007 for more information. | 6 # See http://hub.eyeo.com/issues/2007 for more information. |
| 7 # | 7 # |
| 8 class adblockplus::legacy::webserver { | 8 class adblockplus::legacy::webserver { |
| 9 | 9 |
| 10 class {'web::server': | 10 class {'web::server': |
| 11 vhost => 'adblockplus.org', | 11 vhost => 'adblockplus.org', |
| 12 certificate => 'adblockplus.org_sslcert.pem', | 12 certificate => 'adblockplus.org_sslcert.pem', |
| 13 private_key => 'adblockplus.org_sslcert.key', | 13 private_key => 'adblockplus.org_sslcert.key', |
| 14 is_default => true, | 14 is_default => true, |
| 15 aliases => ['www.adblockplus.org'], | 15 aliases => ['www.adblockplus.org'], |
| 16 custom_config => template("web/adblockplus.org.conf.erb"), | 16 custom_config => template("web/adblockplus.org.conf.erb"), |
| 17 repository => 'web.adblockplus.org', | 17 repository => 'web.adblockplus.org', |
| 18 multiplexer_locations => ['/getSubscription'], | 18 multiplexer_locations => ['/getSubscription'], |
| 19 geoip => true, | 19 geoip => true, |
| 20 } | |
| 21 | |
| 22 nginx::module{'geoip': | |
| 23 path => 'modules/ngx_http_geoip_module.so', | |
| 20 } | 24 } |
| 21 | 25 |
| 22 ensure_packages([ | 26 ensure_packages([ |
| 23 'make', | 27 'make', |
| 24 'doxygen', | 28 'doxygen', |
| 25 ]) | 29 ]) |
| 26 | 30 |
| 27 $subscription_repo = '/home/www/subscriptionlist' | 31 $subscription_repo = '/home/www/subscriptionlist' |
| 28 | 32 |
| 29 $fetch_repo_cmd = [ | 33 $fetch_repo_cmd = [ |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 68 Class['sitescripts'], | 72 Class['sitescripts'], |
| 69 Class['web::server'], | 73 Class['web::server'], |
| 70 Class['nodejs'], | 74 Class['nodejs'], |
| 71 ], | 75 ], |
| 72 command => shellquote($generate_docs_cmd), | 76 command => shellquote($generate_docs_cmd), |
| 73 user => www, | 77 user => www, |
| 74 minute => '5-55/10', | 78 minute => '5-55/10', |
| 75 } | 79 } |
| 76 } | 80 } |
| 77 | 81 |
| LEFT | RIGHT |
« no previous file
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
