#11294 - Generate and store anonymized HTTPd logs

modules/nginx/manifests/init.pp

Index: modules/nginx/manifests/init.pp
diff --git a/modules/nginx/manifests/init.pp b/modules/nginx/manifests/init.pp
index 1375861a9f8dcc81ce75ad2695b345cd6464a180..cc80191d2df05111b99967e1a71ee7f1ee5af952 100644
--- a/modules/nginx/manifests/init.pp
+++ b/modules/nginx/manifests/init.pp
@@ -10,6 +10,11 @@ class nginx (
   # 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',
   }
@@ -111,6 +116,7 @@ class nginx (
       $alt_names = [],
       $log,
       $log_format = 'main',
+      $log_salt = hiera('adblockplus::log::salt', 'changeme'),
       $is_default = false,
       $source = undef,
       $content = undef,
@@ -257,4 +263,11 @@ class nginx (
     owner => 'root',
     source => 'puppet:///modules/nginx/anonymize-access-log.py',
   }
+
+  file {'/var/log/archive':
+    ensure => 'directory',
+    group => 'adm',
+    mode => '0750',
+    owner => 'root',
+  }
 }