diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server
--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2017-03-29 13:46:37.201000000 -0400
+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2017-03-29 13:48:24.735000000 -0400
@@ -4,8 +4,11 @@
 my $pass = ${'zabbix-server'}{'DbPassword'} || 'secret';
 
 my $schema = `rpm -qd zabbix-server-mysql | grep schema | grep mysql`;
+$schema = `rpm -qd zabbix-server | grep schema | grep mysql` if $schema eq '';
 my $data = `rpm -qd zabbix-server-mysql | grep data.sql`;
+$data = `rpm -qd zabbix-server| grep mysql | grep data.sql` if $data eq '';
 my $images = `rpm -qd zabbix-server-mysql | grep images_mysql`;
+$images = `rpm -qd zabbix-server | grep mysql |grep images` if $images eq '';
 
 
 $OUT .= <<"END";
diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID
--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID	2009-02-02 21:55:05.000000000 -0500
+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID	2017-03-29 13:50:01.244000000 -0400
@@ -1,11 +1,11 @@
 ############ GENERAL PARAMETERS #################
 
+#NodeID dropped since Zabbix 2.40
+{
 # This defines unique NodeID in distributed setup,
 # Default value 0 (standalone server)
 # This parameter must be between 0 and 999
-
-{
-my $nodeID = ${'zabbix-server'}{'NodeID'} || '0';
-$OUT .= "NodeID=$nodeID\n";
+#my $nodeID = ${'zabbix-server'}{'NodeID'} || '0';
+#$OUT .= "NodeID=$nodeID\n";
 }