From 8325bcd4f224a6b8b05c7db0b881fa156e79ec44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Sch=C3=BCmann?= <freifunkhh@nico22.de>
Date: Fri, 5 Dec 2014 21:07:57 +0100
Subject: [PATCH] Own path

---
 sudoers.d/20_zabbix                              | 10 +++++-----
 zabbix_agentd.d/userparameter_batman.conf        |  6 +++---
 zabbix_agentd.d/userparameter_conntrack.conf     |  4 ++--
 zabbix_agentd.d/userparameter_dhcp.conf          |  6 +++---
 zabbix_agentd.d/userparameter_route-table42.conf |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sudoers.d/20_zabbix b/sudoers.d/20_zabbix
index b471ad9..1e091fb 100644
--- a/sudoers.d/20_zabbix
+++ b/sudoers.d/20_zabbix
@@ -1,5 +1,5 @@
-zabbix ALL= NOPASSWD: /opt/bin/batman-gateway-mode-enabled.sh
-zabbix ALL= NOPASSWD: /opt/bin/batman-maximum-gateway-metric.sh
-zabbix ALL= NOPASSWD: /opt/bin/batman-visible-gateway-count.sh
-zabbix ALL= NOPASSWD: /opt/bin/route-table42-reachable6.sh
-zabbix ALL= NOPASSWD: /opt/bin/route-table42-reachable.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/batman-gateway-mode-enabled.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/batman-maximum-gateway-metric.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/batman-visible-gateway-count.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/route-table42-reachable6.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/route-table42-reachable.sh
diff --git a/zabbix_agentd.d/userparameter_batman.conf b/zabbix_agentd.d/userparameter_batman.conf
index cf30a90..8e45cc8 100644
--- a/zabbix_agentd.d/userparameter_batman.conf
+++ b/zabbix_agentd.d/userparameter_batman.conf
@@ -1,4 +1,4 @@
-UserParameter=batman-gateway-mode-enabled,sudo /opt/bin/batman-gateway-mode-enabled.sh
-UserParameter=batman-maximum-gateway-metric,sudo /opt/bin/batman-maximum-gateway-metric.sh
-UserParameter=batman-visible-gateway-count,sudo /opt/bin/batman-visible-gateway-count.sh
+UserParameter=batman-gateway-mode-enabled,sudo /opt/bin/zabbix/batman-gateway-mode-enabled.sh
+UserParameter=batman-maximum-gateway-metric,sudo /opt/bin/zabbix/batman-maximum-gateway-metric.sh
+UserParameter=batman-visible-gateway-count,sudo /opt/bin/zabbix/batman-visible-gateway-count.sh
 
diff --git a/zabbix_agentd.d/userparameter_conntrack.conf b/zabbix_agentd.d/userparameter_conntrack.conf
index 1749e14..523ed5f 100644
--- a/zabbix_agentd.d/userparameter_conntrack.conf
+++ b/zabbix_agentd.d/userparameter_conntrack.conf
@@ -1,2 +1,2 @@
-UserParameter=ip_conntrack_count,/opt/bin/conntrack_count.sh
-UserParameter=ip_conntrack_max,/opt/bin/conntrack_max.sh
+UserParameter=ip_conntrack_count,/opt/bin/zabbix/conntrack_count.sh
+UserParameter=ip_conntrack_max,/opt/bin/zabbix/conntrack_max.sh
diff --git a/zabbix_agentd.d/userparameter_dhcp.conf b/zabbix_agentd.d/userparameter_dhcp.conf
index a0bb3e1..63db7ba 100644
--- a/zabbix_agentd.d/userparameter_dhcp.conf
+++ b/zabbix_agentd.d/userparameter_dhcp.conf
@@ -1,3 +1,3 @@
-UserParameter=dhcp_lease_free,/opt/bin/dhcp-pool-usage-percent.sh free
-UserParameter=dhcp_lease_used,/opt/bin/dhcp-pool-usage-percent.sh used
-UserParameter=dhcp_server_running,/opt/bin/dhcp_server_running.sh
+UserParameter=dhcp_lease_free,/opt/bin/zabbix/dhcp-pool-usage-percent.sh free
+UserParameter=dhcp_lease_used,/opt/bin/zabbix/dhcp-pool-usage-percent.sh used
+UserParameter=dhcp_server_running,/opt/bin/zabbix/dhcp_server_running.sh
diff --git a/zabbix_agentd.d/userparameter_route-table42.conf b/zabbix_agentd.d/userparameter_route-table42.conf
index 06c4179..82a8988 100644
--- a/zabbix_agentd.d/userparameter_route-table42.conf
+++ b/zabbix_agentd.d/userparameter_route-table42.conf
@@ -1,2 +1,2 @@
-UserParameter=route-table42-reachable,sudo /opt/bin/route-table42-reachable.sh
-UserParameter=route-table42-reachable6,sudo /opt/bin/route-table42-reachable6.sh
+UserParameter=route-table42-reachable,sudo /opt/bin/zabbix/route-table42-reachable.sh
+UserParameter=route-table42-reachable6,sudo /opt/bin/zabbix/route-table42-reachable6.sh
-- 
GitLab