From 27ad95b2da1dddb395eba5fb40e033dba2156d2b Mon Sep 17 00:00:00 2001
From: Zdenek Janda <zdenek.janda@cloudevelops.com>
Date: Sun, 26 Oct 2014 16:53:34 +0100
Subject: [PATCH] Ensured deprecated file removed

---
 manifests/plugin/python.pp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/manifests/plugin/python.pp b/manifests/plugin/python.pp
index 0f18e1519..dca4ade7b 100644
--- a/manifests/plugin/python.pp
+++ b/manifests/plugin/python.pp
@@ -4,6 +4,7 @@
   $module,
   $script_source,
   $config = {},
+  $order = '10',
 ) {
   include collectd::params
 
@@ -11,12 +12,19 @@
 
   $conf_dir = $collectd::params::plugin_conf_dir
 
+  # This is deprecated file naming ensuring old style file removed, and should be removed in next major relese
+  file { "${name}.load-deprecated":
+    path => "${conf_dir}/${name}.conf",
+    ensure => absent,
+  }
+  # End deprecation
+
   file {
     "${name}.load":
-      path    => "${conf_dir}/${name}.conf",
+      path    => "${conf_dir}/${order}-${name}.conf",
       owner   => 'root',
       group   => $collectd::params::root_group,
-      mode    => '0644',
+      mode    => '0640',
       content => template('collectd/python.conf.erb'),
       notify  => Service['collectd'],
   }
@@ -26,7 +34,7 @@
       path    => "${modulepath}/${module}.py",
       owner   => 'root',
       group   => $collectd::params::root_group,
-      mode    => '0644',
+      mode    => '0640',
       source  => $script_source,
       require => File["${name}.load"],
       notify  => Service['collectd'],