/[smecontribs]/rpms/smeserver-zabbix-agent/contribs10/smeserver-zabbix-agent-0.4.8-bz11515-sme10.patch
ViewVC logotype

Annotation of /rpms/smeserver-zabbix-agent/contribs10/smeserver-zabbix-agent-0.4.8-bz11515-sme10.patch

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

Revision 1.2 - (hide annotations) (download)
Thu Apr 1 16:11:36 2021 UTC (3 years, 1 month ago) by jpp
Branch: MAIN
CVS Tags: smeserver-zabbix-agent-0_4_8-3_el7_sme, smeserver-zabbix-agent-0_4_8-2_el7_sme, HEAD
Changes since 1.1: +1 -4 lines 
* Thu Apr 01 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.4.8-2.sme
- initial SME10 import [SME: 11515]
  drop in for systemd service file
  update event created for automatic install
  remove ownership of /var/lib/zabbix/bin
1 jpp 1.1 diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/createlinks smeserver-zabbix-agent-0.4.8/createlinks
2     --- smeserver-zabbix-agent-0.4.8.old/createlinks 2020-05-29 03:35:00.000000000 -0400
3     +++ smeserver-zabbix-agent-0.4.8/createlinks 2021-04-01 11:24:36.361000000 -0400
4     @@ -8,7 +8,7 @@
5     zabbix_agentd.conf.d/deprecated_netstat.conf zabbix_agentd.conf.d/deprecated_swap.conf
6     zabbix_agentd.conf.d/extip.conf zabbix_agentd.conf.d/mail.conf zabbix_agentd.conf.d/mysql.conf
7     zabbix_agentd.conf.d/phpki_certs.conf zabbix_agentd.conf.d/samba.conf zabbix_agentd.conf.d/block_devices.conf!){
8     - templates2events("/etc/zabbix/$conf", qw(zabbix-agent-update bootstrap-console-save));
9     + templates2events("/etc/zabbix/$conf", qw(zabbix-agent-update bootstrap-console-save smeserver-zabbix-agent-update));
10     }
11     templates2events("/etc/sudoers", "zabbix-agent-update");
12     templates2events("/etc/rc.d/init.d/masq", "zabbix-agent-update");
13     @@ -18,8 +18,14 @@
14     safe_symlink("restart", "root/etc/e-smith/events/zabbix-agent-update/services2adjust/zabbix-agent");
15     safe_symlink("adjust", "root/etc/e-smith/events/zabbix-agent-update/services2adjust/masq");
16    
17     -# Start and stop links
18     -service_link_enhanced("zabbix-agent", "S98", "7");
19     -service_link_enhanced("zabbix-agent", "K10", "6");
20     -service_link_enhanced("zabbix-agent", "K10", "0");
21     +$event="smeserver-zabbix-agent-update";
22     +templates2events("/etc/sudoers", $event);
23     +templates2events("/etc/rc.d/init.d/masq", $event);
24     +templates2events("/etc/crontab", $event);
25    
26     +# Services to restart
27     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zabbix-agent");
28     +safe_symlink("adjust", "root/etc/e-smith/events/$event/services2adjust/masq");
29     +# systemd-specific action mandatory for this package-update event
30     +event_link("systemd-reload", $event, "89");
31     +event_link("systemd-default", $event, "88");
32     diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf smeserver-zabbix-agent-0.4.8/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf
33     --- smeserver-zabbix-agent-0.4.8.old/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf 1969-12-31 19:00:00.000000000 -0500
34     +++ smeserver-zabbix-agent-0.4.8/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf 2021-04-01 11:19:15.220000000 -0400
35 jpp 1.2 @@ -0,0 +1,2 @@
36 jpp 1.1 +[Install]
37     +WantedBy=sme-server.target
38     diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/.tito/packages/.readme smeserver-zabbix-agent-0.4.8/.tito/packages/.readme
39     --- smeserver-zabbix-agent-0.4.8.old/.tito/packages/.readme 2020-05-29 03:35:00.000000000 -0400
40     +++ smeserver-zabbix-agent-0.4.8/.tito/packages/.readme 1969-12-31 19:00:00.000000000 -0500
41     @@ -1,3 +0,0 @@
42     -the .tito/packages directory contains metadata files
43     -named after their packages. Each file has the latest tagged
44     -version and the project's relative directory.
45     diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/.tito/packages/smeserver-zabbix-agent smeserver-zabbix-agent-0.4.8/.tito/packages/smeserver-zabbix-agent
46     --- smeserver-zabbix-agent-0.4.8.old/.tito/packages/smeserver-zabbix-agent 2020-05-29 03:35:00.000000000 -0400
47     +++ smeserver-zabbix-agent-0.4.8/.tito/packages/smeserver-zabbix-agent 1969-12-31 19:00:00.000000000 -0500
48     @@ -1 +0,0 @@
49     -0.4.8-1 ./
50     diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/.tito/tito.props smeserver-zabbix-agent-0.4.8/.tito/tito.props
51     --- smeserver-zabbix-agent-0.4.8.old/.tito/tito.props 2020-05-29 03:35:00.000000000 -0400
52     +++ smeserver-zabbix-agent-0.4.8/.tito/tito.props 1969-12-31 19:00:00.000000000 -0500
53     @@ -1,6 +0,0 @@
54     -[buildconfig]
55     -builder = tito.builder.Builder
56     -tagger = tito.tagger.VersionTagger
57     -changelog_do_not_remove_cherrypick = 0
58     -changelog_format = %s (%ae)
59     -lib_dir = ../tito_libs
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed