/[smecontribs]/rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-bz11232-installSME10.patch
ViewVC logotype

Diff of /rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-bz11232-installSME10.patch

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

Revision 1.1 by jpp, Sun Nov 7 06:43:24 2021 UTC Revision 1.5 by jpp, Mon Nov 8 04:26:19 2021 UTC
# Line 1  Line 1 
1  diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/createlinks smeserver-zabbix-server-0.1/createlinks  diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/createlinks smeserver-zabbix-server-0.1/createlinks
2  --- smeserver-zabbix-server-0.1.old/createlinks 2021-11-07 01:08:44.157000000 -0500  --- smeserver-zabbix-server-0.1.old/createlinks 2021-11-07 23:22:58.003000000 -0500
3  +++ smeserver-zabbix-server-0.1/createlinks     2021-11-07 01:41:41.185000000 -0500  +++ smeserver-zabbix-server-0.1/createlinks     2021-11-07 23:24:36.079000000 -0500
4  @@ -42,11 +42,13 @@  @@ -42,11 +42,19 @@
5   $contrib = "smeserver-zabbix-server";   $contrib = "smeserver-zabbix-server";
6   event_actions("$contrib-update", qw(   event_actions("$contrib-update", qw(
7     systemd-default 10     systemd-default 10
8    +  systemd-reload 12
9  +  zabbix-server 50  +  zabbix-server 50
10   ));   ));
11    
12   event_templates("$contrib-update", qw(   event_templates("$contrib-update", qw(
13     /etc/httpd/conf/httpd.conf     /etc/httpd/conf/httpd.conf
14     /etc/crontab     /etc/crontab
15    +  /etc/rc.d/init.d/masq
16    +  /etc/sudoers
17  +  /etc/e-smith/sql/init/80zabbix-server  +  /etc/e-smith/sql/init/80zabbix-server
18    +  /etc/zabbix/zabbix.conf.php
19    +  /etc/zabbix/web/zabbix.conf.php
20    +  /var/lib/zabbix/bin/sendxmpp
21     /etc/zabbix/zabbix_server.conf     /etc/zabbix/zabbix_server.conf
22     /usr/share/zabbix/.user.ini     /usr/share/zabbix/.user.ini
23     /etc/systemd/system-preset/49-koozali.preset     /etc/systemd/system-preset/49-koozali.preset
24  @@ -57,6 +59,6 @@  @@ -57,6 +65,7 @@
25   event_services("$contrib-update", qw(   event_services("$contrib-update", qw(
26     httpd-e-smith sigusr1     httpd-e-smith sigusr1
27     php74-php-fpm  reload     php74-php-fpm  reload
28  -  zabbix-server start  -  zabbix-server start
29    +  masq          adjust
30  +  zabbix-server restart  +  zabbix-server restart
31   ));   ));
32    
33    diff -Nur --no-dereference 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
34    --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server     2021-11-07 23:22:57.960000000 -0500
35    +++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 2021-11-07 23:24:59.971000000 -0500
36    @@ -5,7 +5,7 @@
37    
38     my $schema = `rpm -qd zabbix-server-mysql | grep create`;
39     chomp $schema;
40    -my $curcharset=`echo 'show variables like "character_set_database";'|mysql $db|grep character_set_database|sed -r  's/^character_set_database\\s*([a-zA-Z0-9_-]+)/\\1/'`;
41    +my $curcharset=  ( -d "/var/lib/mysql/$db" ) ? `echo 'show variables like "character_set_database";'|mysql $db|grep character_set_database|sed -r  's/^character_set_database\\s*([a-zA-Z0-9_-]+)/\\1/'` : "utf8";
42     chomp $curcharset;
43    
44     $OUT .= <<"END";

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed