1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-radicale-0.0.3.old/createlinks smeserver-radicale-0.0.3/createlinks |
2 |
|
|
--- smeserver-radicale-0.0.3.old/createlinks 2015-10-18 05:35:12.000000000 -0400 |
3 |
|
|
+++ smeserver-radicale-0.0.3/createlinks 2022-08-04 00:38:28.297000000 -0400 |
4 |
|
|
@@ -31,7 +31,25 @@ |
5 |
|
|
templates2events("/etc/services", 'radicale-update'); |
6 |
|
|
safe_symlink("adjust", "root/etc/e-smith/events/radicale-update/services2adjust/masq"); |
7 |
|
|
|
8 |
|
|
+my $pkg= "smeserver-radicale"; |
9 |
|
|
+my $event = "${pkg}-update"; |
10 |
|
|
+ |
11 |
|
|
+event_actions($event, qw( |
12 |
|
|
+ radicale-pip-upgrade 10 |
13 |
|
|
+ systemd-default 88 |
14 |
|
|
+ systemd-reload 89 |
15 |
|
|
+)); |
16 |
|
|
+ |
17 |
|
|
+event_templates($event, qw( |
18 |
|
|
+ /etc/radicale/logging |
19 |
|
|
+ /etc/radicale/config |
20 |
|
|
+ /etc/hosts.allow |
21 |
|
|
+ /etc/rc.d/init.d/masq |
22 |
|
|
+ /etc/services |
23 |
|
|
+)); |
24 |
|
|
+ |
25 |
|
|
+event_services($event, qw( |
26 |
|
|
+ radicale restart |
27 |
|
|
+ masq adjust |
28 |
|
|
+)); |
29 |
|
|
|
30 |
|
|
-service_link_enhanced("radicale", "S95", "7"); |
31 |
|
|
-service_link_enhanced("radicale", "K25", "6"); |
32 |
|
|
-service_link_enhanced("radicale", "K25", "0"); |
33 |
jpp |
1.2 |
diff -Nur --no-dereference smeserver-radicale-0.0.3.old/root/etc/e-smith/events/actions/radicale-pip-upgrade smeserver-radicale-0.0.3/root/etc/e-smith/events/actions/radicale-pip-upgrade |
34 |
|
|
--- smeserver-radicale-0.0.3.old/root/etc/e-smith/events/actions/radicale-pip-upgrade 2015-10-18 05:35:12.000000000 -0400 |
35 |
|
|
+++ smeserver-radicale-0.0.3/root/etc/e-smith/events/actions/radicale-pip-upgrade 2022-08-04 01:03:44.452000000 -0400 |
36 |
|
|
@@ -16,4 +16,4 @@ |
37 |
|
|
system ('chmod 400 /home/e-smith/files/radicale/radicale.*'); |
38 |
|
|
} |
39 |
|
|
|
40 |
|
|
-system ('pip install --upgrade pip radicale'); |
41 |
|
|
+system ('/usr/bin/pip3.6 install --upgrade pip radicale'); |
42 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-radicale-0.0.3.old/root/etc/e-smith/templates/etc/radicale/config/20daemon smeserver-radicale-0.0.3/root/etc/e-smith/templates/etc/radicale/config/20daemon |
43 |
|
|
--- smeserver-radicale-0.0.3.old/root/etc/e-smith/templates/etc/radicale/config/20daemon 2015-10-18 05:35:12.000000000 -0400 |
44 |
|
|
+++ smeserver-radicale-0.0.3/root/etc/e-smith/templates/etc/radicale/config/20daemon 2022-08-04 00:47:49.963000000 -0400 |
45 |
|
|
@@ -4,4 +4,4 @@ |
46 |
|
|
|
47 |
|
|
# File storing the PID in daemon mode |
48 |
|
|
#pid = |
49 |
|
|
-pid = /var/run/radicale/radicale.pid |
50 |
|
|
+pid = /run/radicale/radicale.pid |
51 |
|
|
Les fichiers binaires smeserver-radicale-0.0.3.old/root/etc/rc.d/init.d/.radicale.swp et smeserver-radicale-0.0.3/root/etc/rc.d/init.d/.radicale.swp sont différents |
52 |
|
|
diff -Nur --no-dereference smeserver-radicale-0.0.3.old/root/usr/lib/systemd/system/radicale.service smeserver-radicale-0.0.3/root/usr/lib/systemd/system/radicale.service |
53 |
|
|
--- smeserver-radicale-0.0.3.old/root/usr/lib/systemd/system/radicale.service 1969-12-31 19:00:00.000000000 -0500 |
54 |
|
|
+++ smeserver-radicale-0.0.3/root/usr/lib/systemd/system/radicale.service 2022-08-04 00:48:26.557000000 -0400 |
55 |
|
|
@@ -0,0 +1,14 @@ |
56 |
|
|
+[Unit] |
57 |
|
|
+Description=radicale |
58 |
|
|
+After=syslog.target network-online.target |
59 |
|
|
+ |
60 |
|
|
+[Service] |
61 |
|
|
+ExecStartPre=-/usr/sbin/e-smith/service-status radicale |
62 |
|
|
+ExecStart=/usr/bin/radicale -C /etc/radicale/config |
63 |
|
|
+PIDFile=/run/radicale/radicale.pid |
64 |
|
|
+Type=simple |
65 |
|
|
+User=radicale |
66 |
|
|
+PermissionsStartOnly=true |
67 |
|
|
+ |
68 |
|
|
+[Install] |
69 |
|
|
+WantedBy=sme-server.target |
70 |
|
|
diff -Nur --no-dereference smeserver-radicale-0.0.3.old/root/usr/lib/tmpfiles.d/radicale.conf smeserver-radicale-0.0.3/root/usr/lib/tmpfiles.d/radicale.conf |
71 |
|
|
--- smeserver-radicale-0.0.3.old/root/usr/lib/tmpfiles.d/radicale.conf 1969-12-31 19:00:00.000000000 -0500 |
72 |
|
|
+++ smeserver-radicale-0.0.3/root/usr/lib/tmpfiles.d/radicale.conf 2022-08-04 00:50:49.611000000 -0400 |
73 |
|
|
@@ -0,0 +1 @@ |
74 |
|
|
+d /run/radicale 0755 radicale radicale |