/[smecontribs]/rpms/smeserver-sysmon/contribs10/smeserver-sysmon-systemd-11072.patch
ViewVC logotype

Annotation of /rpms/smeserver-sysmon/contribs10/smeserver-sysmon-systemd-11072.patch

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


Revision 1.3 - (hide annotations) (download)
Fri Aug 5 02:18:49 2022 UTC (2 years, 3 months ago) by trevorb
Branch: MAIN
Changes since 1.2: +4 -6 lines
fix 11072 patch

1 trevorb 1.1 diff -urN smeserver-sysmon-6.5.old/createlinks smeserver-sysmon-6.5/createlinks
2     --- smeserver-sysmon-6.5.old/createlinks 2022-08-03 15:59:11.836382422 +1000
3     +++ smeserver-sysmon-6.5/createlinks 2022-08-03 16:21:21.389855128 +1000
4     @@ -4,16 +4,26 @@
5     use esmith::Build::Backup qw(:all);
6    
7     panel_link("sysmon", "manager");
8     +# our event specific for updating with yum without reboot
9     +$event = 'smeserver-sysmon-update';
10     +#add here the path to your templates needed to expand
11     +#see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
12    
13     -service_link_enhanced("sysmon", "K03", "0");
14     -service_link_enhanced("sysmon", "K03", "1");
15     -service_link_enhanced("sysmon", "S97", "2");
16     -service_link_enhanced("sysmon", "S97", "3");
17     -service_link_enhanced("sysmon", "S97", "4");
18     -service_link_enhanced("sysmon", "S97", "5");
19     -service_link_enhanced("sysmon", "K03", "6");
20     -service_link_enhanced("sysmon", "S97", "7");
21     +foreach my $file (qw(
22     + /etc/dar/DailyBackup.dcf
23     + /etc/systemd/system-preset/49-koozali.preset
24     + /usr/lib/systemd/system/sysmon.service.d/50koozali.conf
25     +))
26     +{
27     + templates2events( $file, $event );
28     +};
29     +#action needed in case we have a systemd unit
30     +event_link('systemd-default', $event, '10');
31     +event_link('systemd-reload', $event, '50');
32     +#services we need to restart
33     +safe_symlink('restart',"root/etc/e-smith/events/$event/services2adjust/sysmon");
34    
35     backup_includes("smeserver-sysmon", qw(
36     /var/lib/rrd/
37     -));
38     \ No newline at end of file
39     +));
40     +
41     diff -urN smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/10Unit smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/10Unit
42     --- smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/10Unit 1970-01-01 10:00:00.000000000 +1000
43     +++ smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/10Unit 2022-08-03 16:10:56.207980079 +1000
44     @@ -0,0 +1,6 @@
45     +
46     +[Unit]
47     +Description=System Monitor
48     +After=network-online.target
49     +Wants=network-online.target
50     diff -urN smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/20Service smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/20Service
51     --- smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/20Service 1970-01-01 10:00:00.000000000 +1000
52     +++ smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/20Service 2022-08-03 16:12:26.238523740 +1000
53     @@ -0,0 +1,5 @@
54     +
55     +[Service]
56     +ExecStart=
57     +ExecStart=/usr/sbin/sysmon
58     +
59     diff -urN smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/30Install smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/30Install
60     --- smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/30Install 1970-01-01 10:00:00.000000000 +1000
61     +++ smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/30Install 2022-08-03 16:11:05.607828018 +1000
62     @@ -0,0 +1,3 @@
63     +
64     +[Install]
65     +WantedBy=sme-server.target
66     diff -urN smeserver-sysmon-6.5.old/root/etc/rc.d/init.d/sysmon smeserver-sysmon-6.5/root/etc/rc.d/init.d/sysmon
67     --- smeserver-sysmon-6.5.old/root/etc/rc.d/init.d/sysmon 2022-08-03 15:59:11.836382422 +1000
68     +++ smeserver-sysmon-6.5/root/etc/rc.d/init.d/sysmon 1970-01-01 10:00:00.000000000 +1000
69     @@ -1,44 +0,0 @@
70     -#!/bin/sh
71     -#
72     -# sysmon: Starts the sysmon daemon
73     -#
74     -# chkconfig: 2345 97 03
75     -# processname: sysmon
76     -
77     -# Source function library.
78     -. /etc/rc.d/init.d/functions
79     -
80     -RETVAL=0
81     -
82     -# See how we were called.
83     -case "$1" in
84     - start)
85     - echo -n "Starting sysmon daemon: "
86     - daemon sysmon
87     - RETVAL=$?
88     - echo
89     - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sysmon
90     - ;;
91     - stop)
92     - echo -n "Stopping sysmon daemon: "
93     - killproc sysmon
94     - RETVAL=$?
95     - rm -f /var/lock/subsys/sysmon && rm -f /var/lock/sysmon
96     - echo
97     - ;;
98     - status)
99     - status sysmon
100     - RETVAL=$?
101     - ;;
102     - restart)
103     - $0 stop
104     - $0 start
105     - RETVAL=$?
106     - ;;
107     - *)
108     - echo "Usage: $0 {start|stop|status|restart}"
109     - exit 1
110     -esac
111     -
112     -exit $RETVAL
113     -
114 trevorb 1.3 diff -urN smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service
115     --- smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service 1970-01-01 10:00:00.000000000 +1000
116     +++ smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service 2022-08-05 12:02:45.000000000 +1000
117     @@ -0,0 +1,12 @@
118 trevorb 1.2 +
119     +[Unit]
120     +Description=System Monitor
121     +After=network-online.target
122     +Wants=network-online.target
123     +
124     +[Service]
125     +ExecStart=
126     +ExecStart=/usr/bin/perl /usr/sbin/sysmon
127     +
128     +[Install]
129     +WantedBy= sme-server.target

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