Unified Diff: modules/web/manifests/server.pp
Issue 29785567:
#11294 - Generate and store anonymized HTTPd logs (Closed)
Patch Set:
Created May 18, 2018, 3:16 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/private-stub/hiera/base.yaml ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/web/manifests/server.pp |
| =================================================================== |
| --- a/modules/web/manifests/server.pp |
| +++ b/modules/web/manifests/server.pp |
| @@ -12,6 +12,7 @@ |
| include sitescripts |
| include adblockplus::web |
| + include geoip |
| $remote = hiera('web::server::remote', "https://hg.adblockplus.org/${repository}") |
| @@ -35,15 +36,7 @@ |
| } |
| class {'nginx': |
| - geoip_country => $geoip ? { |
| - false => undef, |
| - default => '/usr/share/GeoIP/GeoIPv6.dat', |
| - }, |
| - } |
| - |
| - class {'geoip': |
| - cron => {hour => 0, minute => 8, monthday => 15}, |
| - ensure => $geoip ? {false => 'absent', default => 'present'}, |
| + geoip_country => '/usr/share/GeoIP/GeoIPv6.dat', |
| } |
| # Make sure that apt packages corresponding to the pip-installed modules below |
« no previous file with comments
|
« modules/private-stub/hiera/base.yaml ('k')
|
no next file »
|
no next file with comments »
