| 1 |
diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks |
| 2 |
--- e-smith-base-5.8.0.old/createlinks 2020-12-09 11:03:25.563000000 -0500 |
| 3 |
+++ e-smith-base-5.8.0/createlinks 2020-12-09 11:41:07.555000000 -0500 |
| 4 |
@@ -607,34 +607,11 @@ |
| 5 |
$event = "email-update"; |
| 6 |
|
| 7 |
|
| 8 |
-my %service2order = |
| 9 |
-( |
| 10 |
- # Start rsyslog up before network! |
| 11 |
- 'local' => "99", |
| 12 |
-); |
| 13 |
- |
| 14 |
-foreach my $service (keys %service2order) |
| 15 |
-{ |
| 16 |
- service_link_enhanced($service, $service2order{$service}, 7); |
| 17 |
-} |
| 18 |
- |
| 19 |
- |
| 20 |
-foreach my $service (keys %service2order) |
| 21 |
-{ |
| 22 |
- service_link_enhanced($service, $service2order{$service}, 0); |
| 23 |
- service_link_enhanced($service, $service2order{$service}, 6); |
| 24 |
- service_link_enhanced($service, $service2order{$service}, 1); |
| 25 |
-} |
| 26 |
- |
| 27 |
# Set up links to daemontools. |
| 28 |
|
| 29 |
safe_symlink("run.dhclient", "root/var/service/wan/run.DHCPHostname"); |
| 30 |
safe_symlink("run.dhclient", "root/var/service/wan/run.DHCPEthernetAddress"); |
| 31 |
|
| 32 |
-# Local event |
| 33 |
-safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/local"); |
| 34 |
-safe_symlink("/var/service/local" , 'root/service/local'); |
| 35 |
-safe_touch("root/var/service/local/down"); |
| 36 |
|
| 37 |
# no template headers for /etc/pam_ldap.secret |
| 38 |
safe_touch("root/etc/e-smith/templates/etc/pam_ldap.secret/template-begin"); |
| 39 |
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service |
| 40 |
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service 1969-12-31 19:00:00.000000000 -0500 |
| 41 |
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service 2020-12-09 11:19:00.868000000 -0500 |
| 42 |
@@ -0,0 +1,14 @@ |
| 43 |
+[Unit] |
| 44 |
+Description=Local service for Koozali SME Server |
| 45 |
+After=network-pre.target networking.service |
| 46 |
+ |
| 47 |
+[Service] |
| 48 |
+Type=oneshot |
| 49 |
+ExecStartPre=/sbin/e-smith/service-status local |
| 50 |
+ExecStartPre=/usr/bin/chmod +x /etc/rc.d/rc.local |
| 51 |
+ExecStart=/sbin/e-smith/signal-event local |
| 52 |
+ExecStart=/usr/bin/systemctl restart rc-local.service |
| 53 |
+RemainAfterExit=yes |
| 54 |
+ |
| 55 |
+[Install] |
| 56 |
+WantedBy=sme-server.target |
| 57 |
diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks |
| 58 |
--- e-smith-base-5.8.0.old/createlinks 2020-12-09 22:24:31.760000000 -0500 |
| 59 |
+++ e-smith-base-5.8.0/createlinks 2020-12-09 22:33:47.569000000 -0500 |
| 60 |
@@ -579,6 +579,7 @@ |
| 61 |
#-------------------------------------------------- |
| 62 |
|
| 63 |
$event = "local"; |
| 64 |
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rc-local"); |
| 65 |
|
| 66 |
#-------------------------------------------------- |
| 67 |
# actions for ldap-update event |
| 68 |
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/status e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/status |
| 69 |
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/status 1969-12-31 19:00:00.000000000 -0500 |
| 70 |
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/status 2020-12-09 22:30:03.095000000 -0500 |
| 71 |
@@ -0,0 +1 @@ |
| 72 |
+enabled |
| 73 |
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/type e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/type |
| 74 |
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/type 1969-12-31 19:00:00.000000000 -0500 |
| 75 |
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/type 2020-12-09 22:29:53.888000000 -0500 |
| 76 |
@@ -0,0 +1 @@ |
| 77 |
+configuration |
| 78 |
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service |
| 79 |
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service 2020-12-09 22:24:31.778000000 -0500 |
| 80 |
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service 2020-12-09 22:31:09.422000000 -0500 |
| 81 |
@@ -7,7 +7,6 @@ |
| 82 |
ExecStartPre=/sbin/e-smith/service-status local |
| 83 |
ExecStartPre=/usr/bin/chmod +x /etc/rc.d/rc.local |
| 84 |
ExecStart=/sbin/e-smith/signal-event local |
| 85 |
-ExecStart=/usr/bin/systemctl restart rc-local.service |
| 86 |
RemainAfterExit=yes |
| 87 |
|
| 88 |
[Install] |
| 89 |
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset |
| 90 |
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset 2020-12-09 22:24:31.756000000 -0500 |
| 91 |
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset 2020-12-09 22:32:19.660000000 -0500 |
| 92 |
@@ -35,6 +35,8 @@ |
| 93 |
enable ldap.service |
| 94 |
enable ldap.init.service |
| 95 |
enable local.service |
| 96 |
+enable yum.service |
| 97 |
+disable rc-local.service |
| 98 |
|
| 99 |
#need to change after integration |
| 100 |
#enable mariadb.service |
| 101 |
@@ -65,7 +67,6 @@ |
| 102 |
disable squid.service |
| 103 |
disable sshd.service |
| 104 |
enable tinydns.service |
| 105 |
-enable wan.service |
| 106 |
disable nut-server.service |
| 107 |
disable nut-monitor.service |
| 108 |
disable ntpdate.service |
Parent Directory
| 
Revision Log
| 
Revision Graph
