1 |
jpp |
1.1 |
diff -Nur e-smith-qmail-2.6.0.old/createlinks e-smith-qmail-2.6.0/createlinks |
2 |
|
|
--- e-smith-qmail-2.6.0.old/createlinks 2020-12-04 00:56:26.546000000 -0500 |
3 |
|
|
+++ e-smith-qmail-2.6.0/createlinks 2020-12-04 02:14:53.286000000 -0500 |
4 |
|
|
@@ -202,8 +202,6 @@ |
5 |
|
|
$event = "e-smith-qmail-update"; |
6 |
|
|
|
7 |
|
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/qmail"); |
8 |
|
|
-templates2events("/etc/systemd/system-preset/49-koozali.preset", $event); |
9 |
|
|
-event_link("systemd-reload", $event, "89"); |
10 |
|
|
|
11 |
|
|
#-------------------------------------------------- |
12 |
|
|
# actions for pseudonym-{create,delete,modify} |
13 |
|
|
@@ -219,7 +217,7 @@ |
14 |
|
|
} |
15 |
|
|
|
16 |
|
|
safe_symlink("daemontools", "root/etc/rc.d/init.d/qmail"); |
17 |
|
|
-#service_link_enhanced("qmail", "S80", "7"); |
18 |
|
|
+service_link_enhanced("qmail", "S80", "7"); |
19 |
|
|
service_link_enhanced("qmail", "K60", "6"); |
20 |
|
|
service_link_enhanced("qmail", "K60", "0"); |
21 |
|
|
service_link_enhanced("qmail", "K60", "1"); |
22 |
|
|
diff -Nur e-smith-qmail-2.6.0.old/createlinks.orig e-smith-qmail-2.6.0/createlinks.orig |
23 |
|
|
--- e-smith-qmail-2.6.0.old/createlinks.orig 1969-12-31 19:00:00.000000000 -0500 |
24 |
|
|
+++ e-smith-qmail-2.6.0/createlinks.orig 2020-12-04 02:14:53.287000000 -0500 |
25 |
|
|
@@ -0,0 +1,227 @@ |
26 |
|
|
+#!/usr/bin/perl -w |
27 |
|
|
+ |
28 |
|
|
+use esmith::Build::CreateLinks qw(:all); |
29 |
|
|
+use File::Basename; |
30 |
|
|
+use File::Path; |
31 |
|
|
+ |
32 |
|
|
+# email-conf - console-save, bootstrap-console-save, domain-create, domain-delete, |
33 |
|
|
+# ip-change, email-update, host-create, host-delete, host-modify, post-upgrade |
34 |
|
|
+ |
35 |
|
|
+ |
36 |
|
|
+foreach (qw( |
37 |
|
|
+ bouncefrom |
38 |
|
|
+ bouncehost |
39 |
|
|
+ concurrencylocal |
40 |
|
|
+ concurrencyremote |
41 |
|
|
+ databytes |
42 |
|
|
+ defaultdomain |
43 |
|
|
+ defaulthost |
44 |
|
|
+ doublebounceto |
45 |
|
|
+ envnoathost |
46 |
|
|
+ helohost |
47 |
|
|
+ locals |
48 |
|
|
+ me |
49 |
|
|
+ plusdomain |
50 |
|
|
+ rcpthosts |
51 |
|
|
+ smtproutes |
52 |
|
|
+ virtualdomains |
53 |
|
|
+ )) |
54 |
|
|
+{ |
55 |
|
|
+ templates2events("/var/qmail/control/$_", qw( |
56 |
|
|
+ console-save |
57 |
|
|
+ bootstrap-console-save |
58 |
|
|
+ domain-create |
59 |
|
|
+ domain-delete |
60 |
|
|
+ ip-change |
61 |
|
|
+ email-update |
62 |
|
|
+ host-create |
63 |
|
|
+ host-delete |
64 |
|
|
+ host-modify |
65 |
|
|
+ post-upgrade |
66 |
|
|
+ e-smith-qmail-update |
67 |
|
|
+ )); |
68 |
|
|
+} |
69 |
|
|
+ |
70 |
|
|
+foreach (qw( |
71 |
|
|
+ /var/qmail/alias/.qmail-default |
72 |
|
|
+ /var/qmail/alias/.qmail-localdelivery-default |
73 |
|
|
+ )) |
74 |
|
|
+{ |
75 |
|
|
+ templates2events($_, qw( |
76 |
|
|
+ console-save |
77 |
|
|
+ bootstrap-console-save |
78 |
|
|
+ domain-create |
79 |
|
|
+ domain-delete |
80 |
|
|
+ ip-change |
81 |
|
|
+ email-update |
82 |
|
|
+ host-create |
83 |
|
|
+ host-delete |
84 |
|
|
+ host-modify |
85 |
|
|
+ post-upgrade |
86 |
|
|
+ e-smith-qmail-update |
87 |
|
|
+ )); |
88 |
|
|
+} |
89 |
|
|
+ |
90 |
|
|
+templates2events("/var/qmail/alias/.qmail-shared" , qw(bootstrap-console-save user-create user-modify user-delete)); |
91 |
|
|
+ |
92 |
|
|
+#-------------------------------------------------- |
93 |
|
|
+# actions for console-save event: |
94 |
|
|
+# write config files and create startup link |
95 |
|
|
+#-------------------------------------------------- |
96 |
|
|
+$event = "console-save"; |
97 |
|
|
+ |
98 |
|
|
+# If qmail-send is running, it will receive the SIGHUP and ignore the |
99 |
|
|
+# start command. If it is not running then the signal will be ignored |
100 |
|
|
+# and qmail-send will read its new configuration files anyway. |
101 |
|
|
+ |
102 |
|
|
+safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail"); |
103 |
|
|
+ |
104 |
|
|
+#-------------------------------------------------- |
105 |
|
|
+# actions for bootstrap-console-save event: |
106 |
|
|
+# write config files and create startup link |
107 |
|
|
+#-------------------------------------------------- |
108 |
|
|
+$event = "bootstrap-console-save"; |
109 |
|
|
+ |
110 |
|
|
+event_link("qmail-update-group", $event, "20"); |
111 |
|
|
+event_link("qmail-update-user", $event, "55"); |
112 |
|
|
+templates2events("/var/qmail/users/assign", $event); |
113 |
|
|
+safe_symlink("/var/qmail/bin/qmail-newu", "root/etc/e-smith/events/$event/S55email-assign"); |
114 |
|
|
+ |
115 |
|
|
+#-------------------------------------------------- |
116 |
|
|
+# actions for domain-create event: |
117 |
|
|
+# rewrite config files and restart server |
118 |
|
|
+#-------------------------------------------------- |
119 |
|
|
+$event = "domain-create"; |
120 |
|
|
+ |
121 |
|
|
+# If qmail-send is running, it will receive the SIGHUP and ignore the |
122 |
|
|
+# start command. If it is not running then the signal will be ignored |
123 |
|
|
+# and qmail-send will read its new configuration files anyway. |
124 |
|
|
+ |
125 |
|
|
+safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail"); |
126 |
|
|
+ |
127 |
|
|
+#-------------------------------------------------- |
128 |
|
|
+# actions for domain-delete event: |
129 |
|
|
+# rewrite config files and restart server |
130 |
|
|
+#-------------------------------------------------- |
131 |
|
|
+$event = "domain-delete"; |
132 |
|
|
+ |
133 |
|
|
+ |
134 |
|
|
+# If qmail-send is running, it will receive the SIGHUP and ignore the |
135 |
|
|
+# start command. If it is not running then the signal will be ignored |
136 |
|
|
+# and qmail-send will read its new configuration files anyway. |
137 |
|
|
+ |
138 |
|
|
+safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail"); |
139 |
|
|
+ |
140 |
|
|
+#-------------------------------------------------- |
141 |
|
|
+# actions for email-update event: |
142 |
|
|
+# email parameters have been changed in the e-smith |
143 |
|
|
+# manager; update system security, rewrite email config |
144 |
|
|
+# files, configure other system files (crontab is the |
145 |
|
|
+# important one), and restart server |
146 |
|
|
+#-------------------------------------------------- |
147 |
|
|
+$event = "email-update"; |
148 |
|
|
+ |
149 |
|
|
+event_link("qmail-update-user", $event, "20"); |
150 |
|
|
+ |
151 |
|
|
+# If qmail-send is running, it will receive the SIGHUP and ignore the |
152 |
|
|
+# start command. If it is not running then the signal will be ignored |
153 |
|
|
+# and qmail-send will read its new configuration files anyway. |
154 |
|
|
+ |
155 |
|
|
+safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail"); |
156 |
|
|
+safe_symlink("adjust", "root/etc/e-smith/events/$event/services2adjust/masq"); |
157 |
|
|
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smtp-auth-proxy"); |
158 |
|
|
+ |
159 |
|
|
+#-------------------------------------------------- |
160 |
|
|
+# actions for group-create event: |
161 |
|
|
+#-------------------------------------------------- |
162 |
|
|
+$event = "group-create"; |
163 |
|
|
+ |
164 |
|
|
+event_link("qmail-update-group", $event, "20"); |
165 |
|
|
+ |
166 |
|
|
+#-------------------------------------------------- |
167 |
|
|
+# actions for group-delete event: |
168 |
|
|
+#-------------------------------------------------- |
169 |
|
|
+$event = "group-delete"; |
170 |
|
|
+ |
171 |
|
|
+event_link("qmail-delete-group", $event, "20"); |
172 |
|
|
+ |
173 |
|
|
+#-------------------------------------------------- |
174 |
|
|
+# actions for group-modify event: |
175 |
|
|
+#-------------------------------------------------- |
176 |
|
|
+$event = "group-modify"; |
177 |
|
|
+ |
178 |
|
|
+event_link("qmail-update-group", $event, "20"); |
179 |
|
|
+ |
180 |
|
|
+#-------------------------------------------------- |
181 |
|
|
+# actions for user-create event: |
182 |
|
|
+#-------------------------------------------------- |
183 |
|
|
+$event = "user-create"; |
184 |
|
|
+ |
185 |
|
|
+event_link("qmail-update-user", $event, "20"); |
186 |
|
|
+event_link("qmail-update-group", $event, "20"); |
187 |
|
|
+ |
188 |
|
|
+#-------------------------------------------------- |
189 |
|
|
+# actions for user-modify event |
190 |
|
|
+#-------------------------------------------------- |
191 |
|
|
+$event = "user-modify"; |
192 |
|
|
+ |
193 |
|
|
+event_link("qmail-update-user", $event, "20"); |
194 |
|
|
+event_link("qmail-update-group", $event, "20"); |
195 |
|
|
+ |
196 |
|
|
+#-------------------------------------------------- |
197 |
|
|
+# actions for user-modify-admin event |
198 |
|
|
+#-------------------------------------------------- |
199 |
|
|
+$event = "user-modify-admin"; |
200 |
|
|
+ |
201 |
|
|
+event_link("qmail-update-user", $event, "20"); |
202 |
|
|
+ |
203 |
|
|
+#-------------------------------------------------- |
204 |
|
|
+# actions for user-delete event |
205 |
|
|
+#-------------------------------------------------- |
206 |
|
|
+$event = "user-delete"; |
207 |
|
|
+ |
208 |
|
|
+event_link("qmail-update-group", $event, "25"); |
209 |
|
|
+ |
210 |
|
|
+#-------------------------------------------------- |
211 |
|
|
+# actions for ip-up event: |
212 |
|
|
+#-------------------------------------------------- |
213 |
|
|
+$event = "ip-up"; |
214 |
|
|
+ |
215 |
|
|
+event_link("qmail-ipup", $event, "20"); |
216 |
|
|
+ |
217 |
|
|
+#-------------------------------------------------- |
218 |
|
|
+# actions for ip-change event: |
219 |
|
|
+#-------------------------------------------------- |
220 |
|
|
+$event = "ip-change"; |
221 |
|
|
+ |
222 |
|
|
+safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail"); |
223 |
|
|
+ |
224 |
|
|
+#-------------------------------------------------- |
225 |
|
|
+# actions for e-smith-qmail-update event: |
226 |
|
|
+#-------------------------------------------------- |
227 |
|
|
+$event = "e-smith-qmail-update"; |
228 |
|
|
+ |
229 |
|
|
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/qmail"); |
230 |
|
|
+ |
231 |
|
|
+#-------------------------------------------------- |
232 |
|
|
+# actions for pseudonym-{create,delete,modify} |
233 |
|
|
+#-------------------------------------------------- |
234 |
|
|
+foreach $event ( qw(pseudonym-create pseudonym-modify pseudonym-delete |
235 |
|
|
+ user-create user-modify user-delete |
236 |
|
|
+ )) |
237 |
|
|
+{ |
238 |
|
|
+ templates2events("/var/qmail/control/virtualdomains", $event); |
239 |
|
|
+ templates2events("/var/qmail/users/assign", $event); |
240 |
|
|
+ safe_symlink("/var/qmail/bin/qmail-newu", "root/etc/e-smith/events/$event/S55email-assign"); |
241 |
|
|
+ safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail"); |
242 |
|
|
+} |
243 |
|
|
+ |
244 |
|
|
+safe_symlink("daemontools", "root/etc/rc.d/init.d/qmail"); |
245 |
|
|
+service_link_enhanced("qmail", "S80", "7"); |
246 |
|
|
+service_link_enhanced("qmail", "K60", "6"); |
247 |
|
|
+service_link_enhanced("qmail", "K60", "0"); |
248 |
|
|
+service_link_enhanced("qmail", "K60", "1"); |
249 |
|
|
+ |
250 |
|
|
+safe_symlink(".qmail", "root/home/e-smith/.qmail-default"); |
251 |
|
|
+safe_symlink(".qmail-shared", "root/var/qmail/alias/.qmail-shared-default"); |
252 |
|
|
+ |
253 |
|
|
diff -Nur e-smith-qmail-2.6.0.old/createlinks.rej e-smith-qmail-2.6.0/createlinks.rej |
254 |
|
|
--- e-smith-qmail-2.6.0.old/createlinks.rej 1969-12-31 19:00:00.000000000 -0500 |
255 |
|
|
+++ e-smith-qmail-2.6.0/createlinks.rej 2020-12-04 02:14:53.287000000 -0500 |
256 |
|
|
@@ -0,0 +1,10 @@ |
257 |
|
|
+--- createlinks 2020-12-04 00:56:26.546000000 -0500 |
258 |
|
|
++++ createlinks 2020-12-04 00:57:10.033000000 -0500 |
259 |
|
|
+@@ -218,7 +218,6 @@ |
260 |
|
|
+ safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail"); |
261 |
|
|
+ } |
262 |
|
|
+ |
263 |
|
|
+-safe_symlink("daemontools", "root/etc/rc.d/init.d/qmail"); |
264 |
|
|
+ #service_link_enhanced("qmail", "S80", "7"); |
265 |
|
|
+ service_link_enhanced("qmail", "K60", "6"); |
266 |
|
|
+ service_link_enhanced("qmail", "K60", "0"); |