Merge pull request #79 from altvnk/no_not_purge_includedir

Allow to not purge include dir.
voxpupuli · Apr 19, 2015 · 0da8681 · 0da8681
2 parents 43e7eca + a775936
commit 0da8681
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/manifests/agent.pp b/manifests/agent.pp
@@ -198,6 +198,7 @@
   $zabbix_alias          = $zabbix::params::agent_zabbix_alias,
   $timeout               = $zabbix::params::agent_timeout,
   $include_dir           = $zabbix::params::agent_include,
+  $include_dir_purge     = $zabbix::params::agent_include_purge,
   $unsafeuserparameters  = $zabbix::params::agent_unsafeuserparameters,
   $userparameter         = $zabbix::params::agent_userparameter,
   $loadmodulepath        = $zabbix::params::agent_loadmodulepath,
@@ -286,7 +287,7 @@
     owner   => 'zabbix',
     group   => 'zabbix',
     recurse => true,
-    purge   => true,
+    purge   => $include_dir_purge,
     notify  => Service['zabbix-agent'],
     require => File[$agent_configfile_path],
   }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -153,6 +153,7 @@
   $agent_zabbix_alias             = undef
   $agent_timeout                  = '3'
   $agent_include                  = '/etc/zabbix/zabbix_agentd.d'
+  $agent_include_purge            = true,
   $agent_unsafeuserparameters     = '0'
   $agent_userparameter            = undef
   $agent_loadmodulepath           = '/usr/lib/modules'