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