#11294 - Generate and store anonymized HTTPd logs

modules/nginx/manifests/init.pp

 class nginx (
     $worker_processes = $nginx::params::worker_processes,
     $worker_connections = $nginx::params::worker_connections,
     $ssl_session_cache =  $nginx::params::ssl_session_cache,
     $geoip_country = undef,
     $geoip_city = undef,
   ) inherits nginx::params {
 
   # Class['ssh'] is assumed to handle SSL-related quirks and therefore
   # the inclusion here became necessary.
   include ssh
 
+  # Class['geoip'] is always required ever since we're archiving anonymized
+  # logs only, which requires querying the country database before the IP is
+  # removed from the record. See modules/nginx/templates/logrotate.erb --
+  include geoip
+
   package {'nginx':
     ensure => 'latest',
   }
 
   if $::lsbdistcodename == 'precise' {
 
     apt::ppa {'ppa:nginx/stable':
     }
 
     apt::source {'nginx':
@@ skipping 81 matching lines @@
     notify => Service['nginx'],
     require => Package['nginx'],
     source => 'puppet:///modules/private/dhe_rsa_export.pem',
   }
 
   define hostconfig (
       $domain = $title,
       $alt_names = [],
       $log,
       $log_format = 'main',
+      $log_salt = hiera('adblockplus::log::salt', 'changeme'),
       $is_default = false,
       $source = undef,
       $content = undef,
       $global_config = undef,
       $certificate = undef,
       $private_key = undef,
       $enabled = true) {
     file {"/etc/nginx/sites-available/${domain}":
       ensure  => file,
       content => template('nginx/site.erb'),
@@ skipping 126 matching lines @@
     require => Package['nginx'],
     source => 'puppet:///modules/nginx/50x.html',
   }
 
   file {'/usr/local/bin/anonymize-access-log':
     group => 'root',
     mode => '0755',
     owner => 'root',
     source => 'puppet:///modules/nginx/anonymize-access-log.py',
   }
+
+  file {'/var/log/archive':
+    ensure => 'directory',
+    group => 'adm',
+    mode => '0750',
+    owner => 'root',
+  }
 }