#11294 - Generate and store anonymized HTTPd logs

modules/web/manifests/server.pp

 class web::server(
     $vhost,
     $repository,
     $certificate = hiera('web::server::certificate', 'undef'),
     $private_key = hiera('web::server::private_key', 'undef'),
     $is_default = false,
     $aliases = undef,
     $custom_config = undef,
     $multiplexer_locations = undef,
     $geoip = false,

[Fred, 2018/05/25 09:48:04]

Do we still need this parameter?

 ) {
 
   include sitescripts
   include adblockplus::web
+  include geoip
 
   $remote = hiera('web::server::remote', "https://hg.adblockplus.org/${repository}")
 
   $pythonpath = 'PYTHONPATH=/opt/cms:/opt/sitescripts'
 
   # Ensure there is at least one character in the respective strings;
   # see https://codereview.adblockplus.org/29329028/#msg3
   validate_re($vhost, '.+')
   validate_re($repository, '.+')
 
   File {
     owner  => 'root',
     group  => 'root',
     mode   => '0644',
   }
 
   Cron {
     environment => concat(hiera('cron::environment', []), [
       $pythonpath,
     ]),
   }
 
   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
   # won't be installed unintentionally, these will take precedence otherwise.
   package {['python-jinja2', 'python-markdown']:
     ensure => 'held',
   }
 
   package {'Jinja2':
     ensure => '2.8',
@@ skipping 122 matching lines @@
   )
 
   cron {'update_repo':
     ensure => present,
     command => $update_webpage_cmd,
     user => www,
     minute  => '5-59/20',
   }
 
 }