/[smeserver]/rpms/e-smith-qmail/sme10/e-smith-qmail-2.6.0-bz11105-systemd.patch
ViewVC logotype

Annotation of /rpms/e-smith-qmail/sme10/e-smith-qmail-2.6.0-bz11105-systemd.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (hide annotations) (download)
Fri Dec 4 05:58:38 2020 UTC (3 years, 11 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-qmail-2_6_0-8_el7_sme
Changes since 1.1: +11 -0 lines
* Fri Dec 04 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
- remove qmail link in init.d [SME: 11105]

1 michel 1.1 diff -urN e-smith-qmail-2.6.0.old/createlinks e-smith-qmail-2.6.0/createlinks
2     --- e-smith-qmail-2.6.0.old/createlinks 2008-10-07 21:37:10.000000000 +0400
3     +++ e-smith-qmail-2.6.0/createlinks 2020-11-14 10:14:37.695951562 +0400
4     @@ -38,6 +38,7 @@
5     host-delete
6     host-modify
7     post-upgrade
8     + e-smith-qmail-update
9     ));
10     }
11    
12     @@ -57,6 +58,7 @@
13     host-delete
14     host-modify
15     post-upgrade
16     + e-smith-qmail-update
17     ));
18     }
19    
20     @@ -188,13 +190,20 @@
21     event_link("qmail-ipup", $event, "20");
22    
23     #--------------------------------------------------
24     -# actions for ip-up event:
25     +# actions for ip-change event:
26     #--------------------------------------------------
27     $event = "ip-change";
28    
29     safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail");
30    
31     #--------------------------------------------------
32     +# actions for e-smith-qmail-update event:
33     +#--------------------------------------------------
34     +$event = "e-smith-qmail-update";
35     +
36     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/qmail");
37     +
38     +#--------------------------------------------------
39     # actions for pseudonym-{create,delete,modify}
40     #--------------------------------------------------
41     foreach $event ( qw(pseudonym-create pseudonym-modify pseudonym-delete
42     diff -urN e-smith-qmail-2.6.0.old/root/usr/lib/systemd/system/qmail.service e-smith-qmail-2.6.0/root/usr/lib/systemd/system/qmail.service
43     --- e-smith-qmail-2.6.0.old/root/usr/lib/systemd/system/qmail.service 1970-01-01 04:00:00.000000000 +0400
44     +++ e-smith-qmail-2.6.0/root/usr/lib/systemd/system/qmail.service 2020-11-14 10:51:18.636587154 +0400
45     @@ -0,0 +1,14 @@
46     +[Unit]
47     +Description=qmail, message transfer agent
48     +After=network.target
49     +
50     +[Service]
51     +Type=oneshot
52     +ExecStartPre=/sbin/e-smith/service-status qmail
53     +ExecStart=/usr/bin/sv u /service/qmail
54     +ExecStop=/usr/bin/sv stop /service/qmail
55     +ExecReload=/usr/bin/sv t /service/qmail
56     +RemainAfterExit=yes
57     +
58     +[Install]
59     +WantedBy=sme-server.target
60     diff -urN e-smith-qmail-2.6.0.old/root/usr/lib/systemd/system-preset/80-koozali-qmail.preset e-smith-qmail-2.6.0/root/usr/lib/systemd/system-preset/80-koozali-qmail.preset
61     --- e-smith-qmail-2.6.0.old/root/usr/lib/systemd/system-preset/80-koozali-qmail.preset 1970-01-01 04:00:00.000000000 +0400
62     +++ e-smith-qmail-2.6.0/root/usr/lib/systemd/system-preset/80-koozali-qmail.preset 2020-11-13 21:30:43.385488184 +0400
63     @@ -0,0 +1 @@
64     +enable qmail.service
65 jpp 1.2 diff -Nur e-smith-qmail-2.6.0.old/createlinks e-smith-qmail-2.6.0/createlinks
66     --- e-smith-qmail-2.6.0.old/createlinks 2020-12-04 00:56:26.546000000 -0500
67     +++ e-smith-qmail-2.6.0/createlinks 2020-12-04 00:57:10.033000000 -0500
68     @@ -218,7 +218,6 @@
69     safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail");
70     }
71    
72     -safe_symlink("daemontools", "root/etc/rc.d/init.d/qmail");
73     #service_link_enhanced("qmail", "S80", "7");
74     service_link_enhanced("qmail", "K60", "6");
75     service_link_enhanced("qmail", "K60", "0");

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed