/[smecontribs]/rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-sme9zabb3.2.4.patch
ViewVC logotype

Contents of /rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-sme9zabb3.2.4.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Fri Dec 4 18:33:29 2020 UTC (3 years, 11 months ago) by brianr
Branch: MAIN
CVS Tags: smeserver-zabbix-server-0_1-22_el7_sme, smeserver-zabbix-server-0_1-29_el7_sme, smeserver-zabbix-server-0_1-28_el7_sme, smeserver-zabbix-server-0_1-25_el7_sme, smeserver-zabbix-server-0_1-27_el7_sme, smeserver-zabbix-server-0_1-24_el7_sme, smeserver-zabbix-server-0_1-21_el7_sme, smeserver-zabbix-server-0_1-26_el7_sme, smeserver-zabbix-server-0_1-30_el7_sme, smeserver-zabbix-server-0_1-20_el7_sme, smeserver-zabbix-server-0_1-23_el7_sme, smeserver-zabbix-server-0_1-31_el7_sme, HEAD
Error occurred while calculating annotation data.
Initial import

1 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
2 --- 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
3 +++ 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 @@ -4,8 +4,11 @@
5 my $pass = ${'zabbix-server'}{'DbPassword'} || 'secret';
6
7 my $schema = `rpm -qd zabbix-server-mysql | grep schema | grep mysql`;
8 +$schema = `rpm -qd zabbix-server | grep schema | grep mysql` if $schema eq '';
9 my $data = `rpm -qd zabbix-server-mysql | grep data.sql`;
10 +$data = `rpm -qd zabbix-server| grep mysql | grep data.sql` if $data eq '';
11 my $images = `rpm -qd zabbix-server-mysql | grep images_mysql`;
12 +$images = `rpm -qd zabbix-server | grep mysql |grep images` if $images eq '';
13
14
15 $OUT .= <<"END";
16 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
17 --- 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
18 +++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID 2017-03-29 13:50:01.244000000 -0400
19 @@ -1,11 +1,11 @@
20 ############ GENERAL PARAMETERS #################
21
22 +#NodeID dropped since Zabbix 2.40
23 +{
24 # This defines unique NodeID in distributed setup,
25 # Default value 0 (standalone server)
26 # This parameter must be between 0 and 999
27 -
28 -{
29 -my $nodeID = ${'zabbix-server'}{'NodeID'} || '0';
30 -$OUT .= "NodeID=$nodeID\n";
31 +#my $nodeID = ${'zabbix-server'}{'NodeID'} || '0';
32 +#$OUT .= "NodeID=$nodeID\n";
33 }
34

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed