1 |
jpp |
1.1 |
diff -Nur e-smith-pptpd-2.6.0.old/createlinks e-smith-pptpd-2.6.0/createlinks |
2 |
|
|
--- e-smith-pptpd-2.6.0.old/createlinks 2008-10-07 13:36:54.000000000 -0400 |
3 |
|
|
+++ e-smith-pptpd-2.6.0/createlinks 2020-12-11 11:07:19.729000000 -0500 |
4 |
|
|
@@ -18,6 +18,7 @@ |
5 |
|
|
user-modify |
6 |
|
|
user-modify-admin |
7 |
|
|
user-delete |
8 |
|
|
+ e-smith-pptpd-update |
9 |
|
|
)); |
10 |
|
|
} |
11 |
|
|
foreach (qw(ppp/ip-up.local ppp/ip-down.local)) |
12 |
|
|
@@ -31,6 +32,7 @@ |
13 |
|
|
user-modify |
14 |
|
|
user-modify-admin |
15 |
|
|
user-delete |
16 |
|
|
+ e-smith-pptpd-update |
17 |
|
|
)); |
18 |
|
|
} |
19 |
|
|
|
20 |
|
|
@@ -47,12 +49,21 @@ |
21 |
|
|
foreach $event (qw(ip-up.pptpd ip-down)) |
22 |
|
|
{ |
23 |
|
|
event_link("pptp-interface-access", $event, "70"); |
24 |
|
|
- safe_symlink("adjust", "root/etc/e-smith/events/$event/services2adjust/masq"); |
25 |
|
|
+ safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/masq"); |
26 |
|
|
} |
27 |
|
|
|
28 |
|
|
event_link("clear-pptp-interfaces", "local", "50"); |
29 |
|
|
|
30 |
|
|
templates2events("/etc/rc.d/init.d/masq", qw(ip-up.pptpd ip-down)); |
31 |
|
|
|
32 |
|
|
-safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/pptpd"); |
33 |
|
|
-service_link_enhanced("pptpd", "S90", "7"); |
34 |
|
|
+ |
35 |
|
|
+#-------------------------------------------------- |
36 |
|
|
+# actions for e-smith-pptpd-update event: |
37 |
|
|
+#-------------------------------------------------- |
38 |
|
|
+$event = "e-smith-pptpd-update"; |
39 |
|
|
+# systemd-specific action mandatory for this package-update event |
40 |
|
|
+event_link("systemd-reload", $event, "89"); |
41 |
|
|
+event_link("systemd-default", $event, "88"); |
42 |
|
|
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/pptpd"); |
43 |
|
|
+safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/masq"); |
44 |
|
|
+ |
45 |
|
|
diff -Nur e-smith-pptpd-2.6.0.old/root/usr/lib/systemd/system/pptpd.service.d/50-koozali.conf e-smith-pptpd-2.6.0/root/usr/lib/systemd/system/pptpd.service.d/50-koozali.conf |
46 |
|
|
--- e-smith-pptpd-2.6.0.old/root/usr/lib/systemd/system/pptpd.service.d/50-koozali.conf 1969-12-31 19:00:00.000000000 -0500 |
47 |
|
|
+++ e-smith-pptpd-2.6.0/root/usr/lib/systemd/system/pptpd.service.d/50-koozali.conf 2020-12-11 11:02:03.266000000 -0500 |
48 |
|
|
@@ -0,0 +1,5 @@ |
49 |
|
|
+[Service] |
50 |
|
|
+ExecStartPre=/sbin/e-smith/service-status pptpd |
51 |
|
|
+ |
52 |
|
|
+[Install] |
53 |
|
|
+WantedBy=sme-server.target |