Issue 3471 - Introduce $adblockplus::directory variable

modules/adblockplus/manifests/log/master.pp

Index: modules/adblockplus/manifests/log/master.pp
diff --git a/modules/adblockplus/manifests/log/master.pp b/modules/adblockplus/manifests/log/master.pp
index 1a3eaf2a1d1457fb8b1223b966510a719ad63269..856cb7f512e87f67aadcdd413776a0b4b2c83b71 100644
--- a/modules/adblockplus/manifests/log/master.pp
+++ b/modules/adblockplus/manifests/log/master.pp
@@ -6,7 +6,7 @@
 class adblockplus::log::master {
 
   include adblockplus
-  realize(File['/var/adblockplus'])
+  realize(File[$adblockplus::directory])
 
   # Mapping hiera values explicitly becomes obsolete with Puppet 3.x
   class {'logstash':
@@ -17,12 +17,12 @@ class adblockplus::log::master {
   }
 
   # Default location for output files in Logstash pipeline configurations
-  file {'/var/adblockplus/log':
+  file {"$adblockplus::directory/log":
     before => Service['logstash'],
     group => 'logstash',
     mode => 0775,
     require => [
-      File['/var/adblockplus'],
+      File[$adblockplus::directory],
       Package['logstash'],
     ],
   }