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 |
+ |
51 |
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 |
52 |
--- 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 |
53 |
+++ 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 |
54 |
@@ -0,0 +1,5 @@ |
55 |
+ |
56 |
+[Service] |
57 |
+ExecStartPre= |
58 |
+ExecStartPre=-/sbin/e-smith/service-status sysmon |
59 |
+ExecStartPre=-/sbin/e-smith/expand-template /usr/lib/systemd/system/sysmon.service.d/50koozali.conf |
60 |
+ExecStart= |
61 |
+ExecStart=-/usr/sbin/sysmon |
62 |
+ |
63 |
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 |
64 |
--- 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 |
65 |
+++ 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 |
66 |
@@ -0,0 +1,3 @@ |
67 |
+ |
68 |
+[Install] |
69 |
+WantedBy=sme-server.target |
70 |
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 |
71 |
--- smeserver-sysmon-6.5.old/root/etc/rc.d/init.d/sysmon 2022-08-03 15:59:11.836382422 +1000 |
72 |
+++ smeserver-sysmon-6.5/root/etc/rc.d/init.d/sysmon 1970-01-01 10:00:00.000000000 +1000 |
73 |
@@ -1,44 +0,0 @@ |
74 |
-#!/bin/sh |
75 |
-# |
76 |
-# sysmon: Starts the sysmon daemon |
77 |
-# |
78 |
-# chkconfig: 2345 97 03 |
79 |
-# processname: sysmon |
80 |
- |
81 |
-# Source function library. |
82 |
-. /etc/rc.d/init.d/functions |
83 |
- |
84 |
-RETVAL=0 |
85 |
- |
86 |
-# See how we were called. |
87 |
-case "$1" in |
88 |
- start) |
89 |
- echo -n "Starting sysmon daemon: " |
90 |
- daemon sysmon |
91 |
- RETVAL=$? |
92 |
- echo |
93 |
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sysmon |
94 |
- ;; |
95 |
- stop) |
96 |
- echo -n "Stopping sysmon daemon: " |
97 |
- killproc sysmon |
98 |
- RETVAL=$? |
99 |
- rm -f /var/lock/subsys/sysmon && rm -f /var/lock/sysmon |
100 |
- echo |
101 |
- ;; |
102 |
- status) |
103 |
- status sysmon |
104 |
- RETVAL=$? |
105 |
- ;; |
106 |
- restart) |
107 |
- $0 stop |
108 |
- $0 start |
109 |
- RETVAL=$? |
110 |
- ;; |
111 |
- *) |
112 |
- echo "Usage: $0 {start|stop|status|restart}" |
113 |
- exit 1 |
114 |
-esac |
115 |
- |
116 |
-exit $RETVAL |
117 |
- |
118 |
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 |
119 |
--- smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service 1970-01-01 10:00:00.000000000 +1000 |
120 |
+++ smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service 2022-08-05 12:02:45.000000000 +1000 |
121 |
@@ -0,0 +1,12 @@ |
122 |
+ |
123 |
+[Unit] |
124 |
+Description=System Monitor |
125 |
+After=network-online.target |
126 |
+Wants=network-online.target |
127 |
+ |
128 |
+[Service] |
129 |
+ExecStartPre= |
130 |
+ExecStartPre=-/sbin/e-smith/service-status sysmon |
131 |
+ExecStartPre=-/sbin/e-smith/expand-template /usr/lib/systemd/system/sysmon.service.d/50koozali.conf |
132 |
+ExecStart= |
133 |
+ExecStart=-/usr/sbin/sysmon |
134 |
+ |
135 |
+[Install] |
136 |
+WantedBy= sme-server.target |
137 |
+ |
138 |
diff -urN smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service.d/50koozali.conf smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service.d/50koozali.conf |
139 |
--- smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service.d/50koozali.conf 1970-01-01 10:00:00.000000000 +1000 |
140 |
+++ smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service.d/50koozali.conf 2022-08-05 12:02:45.000000000 +1000 |
141 |
@@ -0,0 +1,12 @@ |
142 |
+ |
143 |
+[Unit] |
144 |
+Description=System Monitor |
145 |
+After=network-online.target |
146 |
+Wants=network-online.target |
147 |
+ |
148 |
+[Service] |
149 |
+ExecStartPre= |
150 |
+ExecStartPre=-/sbin/e-smith/service-status sysmon |
151 |
+ExecStartPre=-/sbin/e-smith/expand-template /usr/lib/systemd/system/sysmon.service.d/50koozali.conf |
152 |
+ExecStart= |
153 |
+ExecStart=-/usr/sbin/sysmon |
154 |
+ |
155 |
+[Install] |
156 |
+WantedBy= sme-server.target |
157 |
+ |