1 |
jpp |
1.1 |
diff -Nur e-smith-oidentd-2.6.0.old/createlinks e-smith-oidentd-2.6.0/createlinks |
2 |
|
|
--- e-smith-oidentd-2.6.0.old/createlinks 2006-03-15 14:59:23.000000000 -0500 |
3 |
jpp |
1.2 |
+++ e-smith-oidentd-2.6.0/createlinks 2020-11-11 17:29:50.479000000 -0500 |
4 |
|
|
@@ -2,9 +2,37 @@ |
5 |
jpp |
1.1 |
|
6 |
|
|
use esmith::Build::CreateLinks qw(:all); |
7 |
|
|
|
8 |
|
|
-safe_symlink("/etc/rc.d/init.d/daemontools", |
9 |
|
|
- "root/etc/rc.d/init.d/supervise/oidentd"); |
10 |
|
|
|
11 |
|
|
templates2events("/etc/oidentd_masq.conf", qw( |
12 |
|
|
console-save |
13 |
|
|
- bootstrap-console-save)); |
14 |
|
|
+ bootstrap-console-save |
15 |
|
|
+ e-smith-oidentd-update)); |
16 |
|
|
+ |
17 |
|
|
+templates2events("/etc/sysconfig/oidentd", qw( |
18 |
|
|
+ console-save |
19 |
|
|
+ bootstrap-console-save |
20 |
|
|
+ post-install |
21 |
|
|
+ post-upgrade |
22 |
|
|
+ e-smith-oidentd-update)); |
23 |
|
|
+ |
24 |
|
|
+#service restart |
25 |
jpp |
1.2 |
+my $event = "e-smith-oidentd-update"; |
26 |
jpp |
1.1 |
+##will restart only if already running |
27 |
|
|
+#safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/oidentd"); |
28 |
|
|
+ |
29 |
jpp |
1.2 |
+event_link("systemd-default", $event, "05"); |
30 |
jpp |
1.3 |
+event_link("systemd-reload", $event, "89"); |
31 |
jpp |
1.2 |
+ |
32 |
jpp |
1.1 |
+#systemd link |
33 |
|
|
+foreach my $target (qw(multi-user sme-server)) |
34 |
|
|
+{ |
35 |
|
|
+ foreach my $unit (qw( |
36 |
|
|
+ oidentd |
37 |
|
|
+ )) |
38 |
|
|
+ { |
39 |
|
|
+#default is disabled |
40 |
|
|
+# symlink("../$unit", |
41 |
|
|
+# "root/usr/lib/systemd/system/$target.target.wants/$unit") |
42 |
|
|
+# or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!"; |
43 |
|
|
+ } |
44 |
|
|
+} |
45 |
|
|
diff -Nur e-smith-oidentd-2.6.0.old/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options e-smith-oidentd-2.6.0/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options |
46 |
|
|
--- e-smith-oidentd-2.6.0.old/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options 1969-12-31 19:00:00.000000000 -0500 |
47 |
|
|
+++ e-smith-oidentd-2.6.0/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options 2020-11-11 16:53:31.212000000 -0500 |
48 |
|
|
@@ -0,0 +1 @@ |
49 |
|
|
+OIDENTD_OPTIONS="-m -t 10 -q -u daemon -g daemon" |
50 |
|
|
diff -Nur e-smith-oidentd-2.6.0.old/root/usr/lib/systemd/system/oidentd.service.d/50koozali.conf e-smith-oidentd-2.6.0/root/usr/lib/systemd/system/oidentd.service.d/50koozali.conf |
51 |
|
|
--- e-smith-oidentd-2.6.0.old/root/usr/lib/systemd/system/oidentd.service.d/50koozali.conf 1969-12-31 19:00:00.000000000 -0500 |
52 |
|
|
+++ e-smith-oidentd-2.6.0/root/usr/lib/systemd/system/oidentd.service.d/50koozali.conf 2020-11-11 17:00:02.752000000 -0500 |
53 |
|
|
@@ -0,0 +1,3 @@ |
54 |
|
|
+[Service] |
55 |
|
|
+ExecStartPre=/sbin/e-smith/service-status oidentd |
56 |
|
|
+ |
57 |
|
|
diff -Nur e-smith-oidentd-2.6.0.old/root/var/service/oidentd/log/run e-smith-oidentd-2.6.0/root/var/service/oidentd/log/run |
58 |
|
|
--- e-smith-oidentd-2.6.0.old/root/var/service/oidentd/log/run 2006-03-15 14:59:23.000000000 -0500 |
59 |
|
|
+++ e-smith-oidentd-2.6.0/root/var/service/oidentd/log/run 1969-12-31 19:00:00.000000000 -0500 |
60 |
|
|
@@ -1,2 +0,0 @@ |
61 |
|
|
-#!/bin/sh |
62 |
|
|
-exec setuidgid smelog multilog t /var/log/oidentd |
63 |
|
|
diff -Nur e-smith-oidentd-2.6.0.old/root/var/service/oidentd/run e-smith-oidentd-2.6.0/root/var/service/oidentd/run |
64 |
|
|
--- e-smith-oidentd-2.6.0.old/root/var/service/oidentd/run 2006-03-15 14:59:23.000000000 -0500 |
65 |
|
|
+++ e-smith-oidentd-2.6.0/root/var/service/oidentd/run 1969-12-31 19:00:00.000000000 -0500 |
66 |
|
|
@@ -1,3 +0,0 @@ |
67 |
|
|
-#! /bin/sh |
68 |
|
|
-exec 2>&1 |
69 |
|
|
-exec oidentd -m -i -S -t 10 -u daemon -g daemon |