/[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.2 by jpp, Mon Nov 8 03:54:24 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 01:08:44.157000000 -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 01:41:41.185000000 -0500
4  @@ -42,11 +42,13 @@  @@ -42,11 +42,14 @@
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    
# Line 15  diff -Nur --no-dereference smeserver-zab Line 16  diff -Nur --no-dereference smeserver-zab
16     /etc/zabbix/zabbix_server.conf     /etc/zabbix/zabbix_server.conf
17     /usr/share/zabbix/.user.ini     /usr/share/zabbix/.user.ini
18     /etc/systemd/system-preset/49-koozali.preset     /etc/systemd/system-preset/49-koozali.preset
19  @@ -57,6 +59,6 @@  @@ -57,6 +60,6 @@
20   event_services("$contrib-update", qw(   event_services("$contrib-update", qw(
21     httpd-e-smith sigusr1     httpd-e-smith sigusr1
22     php74-php-fpm  reload     php74-php-fpm  reload
# Line 23  diff -Nur --no-dereference smeserver-zab Line 24  diff -Nur --no-dereference smeserver-zab
24  +  zabbix-server restart  +  zabbix-server restart
25   ));   ));
26    
27    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
28    --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server     2021-11-07 22:48:03.407000000 -0500
29    +++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 2021-11-07 22:49:14.498000000 -0500
30    @@ -5,7 +5,7 @@
31    
32     my $schema = `rpm -qd zabbix-server-mysql | grep create`;
33     chomp $schema;
34    -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/'`;
35    +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";
36     chomp $curcharset;
37    
38     $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