Skip to content

Commit

Permalink
Don't break OS python installation
Browse files Browse the repository at this point in the history
  • Loading branch information
xandm committed Mar 2, 2020
1 parent 35b7811 commit ac627bc
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions manifests/plugin/python.pp
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,19 @@
default => 'directory',
}

ensure_resource('file', $module_dirs,
{
'ensure' => $ensure_modulepath,
'mode' => $collectd::plugin_conf_dir_mode,
'owner' => $collectd::config_owner,
'purge' => $collectd::purge_config,
'force' => true,
'group' => $collectd::config_group,
'require' => Package[$collectd::package_name]
}
)
if $module_dirs == $modulepaths {
ensure_resource('file', $module_dirs,
{
'ensure' => $ensure_modulepath,
'mode' => $collectd::plugin_conf_dir_mode,
'owner' => $collectd::config_owner,
'purge' => $collectd::purge_config,
'force' => true,
'group' => $collectd::config_group,
'require' => Package[$collectd::package_name]
}
)
}

# should be loaded after global plugin configuration
$python_conf = "${collectd::plugin_conf_dir}/${conf_name}"
Expand Down

0 comments on commit ac627bc

Please sign in to comment.