From 093a8703769498dcc7458215ae13521f82cbb723 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 21 Mar 2016 18:17:17 +0100
Subject: [PATCH] Remove templates for zabbix_agent.conf which doesn't exists
 anymore in 3.0

---
 createlinks                                                         | 2 +-
 root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/00header    | 5 -----
 .../e-smith/templates/etc/zabbix/zabbix_agent.conf/10zabbixServers  | 6 ------
 root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/20timeout   | 5 -----
 4 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/00header
 delete mode 100644 root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/10zabbixServers
 delete mode 100644 root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/20timeout

diff --git a/createlinks b/createlinks
index dd49024..3b1448c 100644
--- a/createlinks
+++ b/createlinks
@@ -3,7 +3,7 @@
 use esmith::Build::CreateLinks  qw(:all);
 
 # Templates to expand
-foreach my $conf (qw!zabbix_agent.conf zabbix_agentd.conf zabbix_agentd.conf.d/asterisk.conf
+foreach my $conf (qw!zabbix_agentd.conf zabbix_agentd.conf.d/asterisk.conf
                      zabbix_agentd.conf.d/deprecated_cpunum.conf zabbix_agentd.conf.d/deprecated_memory.conf
                      zabbix_agentd.conf.d/deprecated_netstat.conf zabbix_agentd.conf.d/deprecated_swap.conf
                      zabbix_agentd.conf.d/extip.conf zabbix_agentd.conf.d/mail.conf zabbix_agentd.conf.d/mysql.conf
diff --git a/root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/00header b/root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/00header
deleted file mode 100644
index da65913..0000000
--- a/root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/00header
+++ /dev/null
@@ -1,5 +0,0 @@
-# This is config file for zabbix_agent
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-
diff --git a/root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/10zabbixServers b/root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/10zabbixServers
deleted file mode 100644
index 3b06b59..0000000
--- a/root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/10zabbixServers
+++ /dev/null
@@ -1,6 +0,0 @@
-# IP address of ZABBIX server
-# Connections from other hosts will be denied
-
-Server={ (${'zabbix-agent'}{'Servers'} || '127.0.0.1'); }
-
-
diff --git a/root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/20timeout b/root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/20timeout
deleted file mode 100644
index caaf3df..0000000
--- a/root/etc/e-smith/templates/etc/zabbix/zabbix_agent.conf/20timeout
+++ /dev/null
@@ -1,5 +0,0 @@
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-
-Timeout=3
-