From 94eb06a3c753fcca3213bc5940d7d025dc790a37 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 23 Nov 2009 12:27:10 -0500
Subject: move plugin directory to fit new 0.25.x style and update file paths
 accordingly

---
 lib/facter/acpi_available.rb       | 10 ++++++++++
 lib/facter/munin_interfaces.rb     | 16 ++++++++++++++++
 manifests/host.pp                  |  2 +-
 manifests/plugin.pp                |  2 +-
 plugins/facter/acpi_available.rb   | 10 ----------
 plugins/facter/munin_interfaces.rb | 16 ----------------
 6 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 lib/facter/acpi_available.rb
 create mode 100755 lib/facter/munin_interfaces.rb
 delete mode 100644 plugins/facter/acpi_available.rb
 delete mode 100755 plugins/facter/munin_interfaces.rb

diff --git a/lib/facter/acpi_available.rb b/lib/facter/acpi_available.rb
new file mode 100644
index 0000000..e3d8dfa
--- /dev/null
+++ b/lib/facter/acpi_available.rb
@@ -0,0 +1,10 @@
+# return whether acpi is available -- used for deciding whether to install the munin plugin
+Facter.add("acpi_available") do
+	setcode do
+		if `acpi -t -B -A 2>/dev/null`.match(/\d/).nil? 
+			"absent"
+		else
+			"present"
+		end
+	end
+end
diff --git a/lib/facter/munin_interfaces.rb b/lib/facter/munin_interfaces.rb
new file mode 100755
index 0000000..f7a3575
--- /dev/null
+++ b/lib/facter/munin_interfaces.rb
@@ -0,0 +1,16 @@
+# return the set of active interfaces as an array
+Facter.add("munin_interfaces") do
+	setcode do
+		`ip -o link show`.split(/\n/).collect do |line|
+			value = nil
+			matches = line.match(/^\d*: ([^:]*): <(.*,)?UP(,.*)?>/)
+			if !matches.nil?
+				value = matches[1]
+				# remove superfluous "underlying interface" specification 
+				# for VLAN interfaces
+				value.gsub!(/@.*/, '')
+			end
+			value
+		end.compact.sort.join(" ")
+	end
+end
diff --git a/manifests/host.pp b/manifests/host.pp
index 1d17518..804bd02 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -34,7 +34,7 @@ class munin::snmp_collector
 
 	file { 
 		"${module_dir_path}/munin/create_snmp_links":
-			source => "puppet://$servername/munin/create_snmp_links.sh",
+			source => "puppet://$server/modules/munin/create_snmp_links.sh",
 			mode => 755, owner => root, group => root;
 	}
 
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 87259f7..c9bb6e5 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -70,7 +70,7 @@ class munin::plugins::base {
 
 	file {
 		[ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
-			source => "puppet://$servername/common/empty",
+			source => "puppet://$server/modules/common/empty",
 			ensure => directory, checksum => mtime,
 			ignore => '.ignore',
 			recurse => true, purge => true, force => true, 
diff --git a/plugins/facter/acpi_available.rb b/plugins/facter/acpi_available.rb
deleted file mode 100644
index e3d8dfa..0000000
--- a/plugins/facter/acpi_available.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# return whether acpi is available -- used for deciding whether to install the munin plugin
-Facter.add("acpi_available") do
-	setcode do
-		if `acpi -t -B -A 2>/dev/null`.match(/\d/).nil? 
-			"absent"
-		else
-			"present"
-		end
-	end
-end
diff --git a/plugins/facter/munin_interfaces.rb b/plugins/facter/munin_interfaces.rb
deleted file mode 100755
index f7a3575..0000000
--- a/plugins/facter/munin_interfaces.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# return the set of active interfaces as an array
-Facter.add("munin_interfaces") do
-	setcode do
-		`ip -o link show`.split(/\n/).collect do |line|
-			value = nil
-			matches = line.match(/^\d*: ([^:]*): <(.*,)?UP(,.*)?>/)
-			if !matches.nil?
-				value = matches[1]
-				# remove superfluous "underlying interface" specification 
-				# for VLAN interfaces
-				value.gsub!(/@.*/, '')
-			end
-			value
-		end.compact.sort.join(" ")
-	end
-end
-- 
cgit v1.2.3