| 1 |
michel |
1.1 |
diff -urN smeserver-qpsmtpd-2.6.0.old/createlinks smeserver-qpsmtpd-2.6.0/createlinks |
| 2 |
|
|
--- smeserver-qpsmtpd-2.6.0.old/createlinks 2020-11-27 22:53:35.000000000 +0400 |
| 3 |
|
|
+++ smeserver-qpsmtpd-2.6.0/createlinks 2020-11-27 23:34:15.603000000 +0400 |
| 4 |
|
|
@@ -8,6 +8,7 @@ |
| 5 |
|
|
domain-create |
| 6 |
|
|
domain-delete |
| 7 |
|
|
bootstrap-console-save |
| 8 |
|
|
+ smeserver-qpsmtpd-update |
| 9 |
|
|
)) |
| 10 |
|
|
{ |
| 11 |
|
|
event_link("domains-update-dkim", $event, "30"); |
| 12 |
|
|
@@ -18,6 +19,7 @@ |
| 13 |
|
|
foreach $event (qw( |
| 14 |
|
|
network-create |
| 15 |
|
|
network-delete |
| 16 |
|
|
+ smeserver-qpsmtpd-update |
| 17 |
|
|
)) |
| 18 |
|
|
{ |
| 19 |
|
|
templates2events("$service/config/relayclients", $event); |
| 20 |
|
|
@@ -29,6 +31,7 @@ |
| 21 |
|
|
email-update |
| 22 |
|
|
network-create |
| 23 |
|
|
network-delete |
| 24 |
|
|
+ smeserver-qpsmtpd-update |
| 25 |
|
|
)) |
| 26 |
|
|
{ |
| 27 |
|
|
templates2events("$service/peers/0", $event); |
| 28 |
|
|
@@ -42,6 +45,7 @@ |
| 29 |
|
|
bootstrap-console-save |
| 30 |
|
|
console-save |
| 31 |
|
|
email-update |
| 32 |
|
|
+ smeserver-qpsmtpd-update |
| 33 |
|
|
)); |
| 34 |
|
|
|
| 35 |
|
|
templates2events("$service/ssl/cert.pem", qw( |
| 36 |
|
|
@@ -49,12 +53,14 @@ |
| 37 |
|
|
console-save |
| 38 |
|
|
email-update |
| 39 |
|
|
ssl-update |
| 40 |
|
|
+ smeserver-qpsmtpd-update |
| 41 |
|
|
)); |
| 42 |
|
|
|
| 43 |
|
|
templates2events($_, qw( |
| 44 |
|
|
bootstrap-console-save |
| 45 |
|
|
console-save |
| 46 |
|
|
email-update |
| 47 |
|
|
+ smeserver-qpsmtpd-update |
| 48 |
|
|
)) |
| 49 |
|
|
for (qw( |
| 50 |
|
|
/etc/mail-dmarc.ini |
| 51 |
|
|
@@ -67,6 +73,7 @@ |
| 52 |
|
|
bootstrap-console-save |
| 53 |
|
|
console-save |
| 54 |
|
|
email-update |
| 55 |
|
|
+ smeserver-qpsmtpd-update |
| 56 |
|
|
)); |
| 57 |
|
|
|
| 58 |
|
|
my $control = "/var/qmail/control"; |
| 59 |
|
|
@@ -74,6 +81,7 @@ |
| 60 |
|
|
bootstrap-console-save |
| 61 |
|
|
console-save |
| 62 |
|
|
email-update |
| 63 |
|
|
+ smeserver-qpsmtpd-update |
| 64 |
|
|
)); |
| 65 |
|
|
templates2events("$control/badrcptto", qw( |
| 66 |
|
|
bootstrap-console-save |
| 67 |
|
|
@@ -90,6 +98,7 @@ |
| 68 |
|
|
pseudonym-create |
| 69 |
|
|
pseudonym-delete |
| 70 |
|
|
pseudonym-modify |
| 71 |
|
|
+ smeserver-qpsmtpd-update |
| 72 |
|
|
)); |
| 73 |
|
|
|
| 74 |
|
|
my $config = "/var/service/qpsmtpd/config"; |
| 75 |
|
|
@@ -97,6 +106,7 @@ |
| 76 |
|
|
bootstrap-console-save |
| 77 |
|
|
console-save |
| 78 |
|
|
email-update |
| 79 |
|
|
+ smeserver-qpsmtpd-update |
| 80 |
|
|
)) |
| 81 |
|
|
for (qw( |
| 82 |
|
|
IP |
| 83 |
|
|
@@ -135,17 +145,21 @@ |
| 84 |
|
|
pseudonym-create |
| 85 |
|
|
pseudonym-delete |
| 86 |
|
|
pseudonym-modify |
| 87 |
|
|
+ smeserver-qpsmtpd-update |
| 88 |
|
|
)); |
| 89 |
|
|
|
| 90 |
|
|
templates2events("$config/$_", qw( |
| 91 |
|
|
ssl-update |
| 92 |
|
|
+ smeserver-qpsmtpd-update |
| 93 |
|
|
)) |
| 94 |
|
|
for (qw( |
| 95 |
|
|
tls_before_auth |
| 96 |
|
|
tls_ciphers |
| 97 |
|
|
tls_protocols |
| 98 |
|
|
)); |
| 99 |
|
|
+ |
| 100 |
|
|
templates2events("$config/badhelo", 'ip-change'); |
| 101 |
|
|
+ |
| 102 |
|
|
templates2events("$config/goodrcptto", qw( |
| 103 |
|
|
bootstrap-console-save |
| 104 |
|
|
email-update |
| 105 |
|
|
@@ -160,6 +174,7 @@ |
| 106 |
|
|
group-create |
| 107 |
|
|
group-delete |
| 108 |
|
|
group-modify |
| 109 |
|
|
+ smeserver-qpsmtpd-update |
| 110 |
|
|
)); |
| 111 |
|
|
|
| 112 |
|
|
safe_touch("root/etc/e-smith/templates/$config/forcespamcheck/template-begin"); |
| 113 |
|
|
@@ -177,6 +192,7 @@ |
| 114 |
|
|
group-create |
| 115 |
|
|
group-delete |
| 116 |
|
|
group-modify |
| 117 |
|
|
+ smeserver-qpsmtpd-update |
| 118 |
|
|
)); |
| 119 |
|
|
|
| 120 |
|
|
|
| 121 |
|
|
@@ -196,13 +212,20 @@ |
| 122 |
|
|
} |
| 123 |
|
|
|
| 124 |
|
|
safe_symlink("daemontools", "root/etc/rc.d/init.d/qpsmtpd"); |
| 125 |
|
|
-service_link_enhanced("qpsmtpd", "S85", "7"); |
| 126 |
|
|
+#service_link_enhanced("qpsmtpd", "S85", "7"); |
| 127 |
|
|
service_link_enhanced("qpsmtpd", "K55", "6"); |
| 128 |
|
|
service_link_enhanced("qpsmtpd", "K55", "0"); |
| 129 |
|
|
service_link_enhanced("qpsmtpd", "K55", "1"); |
| 130 |
|
|
|
| 131 |
|
|
safe_symlink("daemontools", "root/etc/rc.d/init.d/sqpsmtpd"); |
| 132 |
|
|
-service_link_enhanced("sqpsmtpd", "S85", "7"); |
| 133 |
|
|
+#service_link_enhanced("sqpsmtpd", "S85", "7"); |
| 134 |
|
|
service_link_enhanced("sqpsmtpd", "K55", "6"); |
| 135 |
|
|
service_link_enhanced("sqpsmtpd", "K55", "0"); |
| 136 |
|
|
service_link_enhanced("sqpsmtpd", "K55", "1"); |
| 137 |
|
|
+ |
| 138 |
|
|
+my $event = 'smeserver-qpsmtpd-update'; |
| 139 |
|
|
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/qpsmtpd"); |
| 140 |
|
|
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/sqpsmtpd"); |
| 141 |
|
|
+templates2events("/etc/systemd/system-preset/49-koozali.preset", $event); |
| 142 |
|
|
+event_link("systemd-reload", $event, "94"); |
| 143 |
|
|
+event_link("reset-unsavedflag", $event, "95"); |
| 144 |
|
|
diff -urN smeserver-qpsmtpd-2.6.0.old/root/usr/lib/systemd/system/qpsmtpd.service smeserver-qpsmtpd-2.6.0/root/usr/lib/systemd/system/qpsmtpd.service |
| 145 |
|
|
--- smeserver-qpsmtpd-2.6.0.old/root/usr/lib/systemd/system/qpsmtpd.service 1970-01-01 04:00:00.000000000 +0400 |
| 146 |
|
|
+++ smeserver-qpsmtpd-2.6.0/root/usr/lib/systemd/system/qpsmtpd.service 2020-11-27 23:39:23.913000000 +0400 |
| 147 |
|
|
@@ -0,0 +1,15 @@ |
| 148 |
|
|
+[Unit] |
| 149 |
|
|
+Description=qpsmtpd |
| 150 |
|
|
+After=network.target |
| 151 |
|
|
+Conflicts=proqpsmtpdd.service |
| 152 |
|
|
+ |
| 153 |
|
|
+[Service] |
| 154 |
|
|
+Type=oneshot |
| 155 |
|
|
+ExecStartPre=/sbin/e-smith/service-status qpsmtpd |
| 156 |
|
|
+ExecStart=/usr/bin/sv u /service/qpsmtpd |
| 157 |
|
|
+ExecStop=/usr/bin/sv stop /service/qpsmtpd |
| 158 |
|
|
+ExecReload=/usr/bin/sv t /service/qpsmtpd |
| 159 |
|
|
+RemainAfterExit=yes |
| 160 |
|
|
+ |
| 161 |
|
|
+[Install] |
| 162 |
|
|
+WantedBy=sme-server.target |
| 163 |
|
|
diff -urN smeserver-qpsmtpd-2.6.0.old/root/usr/lib/systemd/system/sqpsmtpd.service smeserver-qpsmtpd-2.6.0/root/usr/lib/systemd/system/sqpsmtpd.service |
| 164 |
|
|
--- smeserver-qpsmtpd-2.6.0.old/root/usr/lib/systemd/system/sqpsmtpd.service 1970-01-01 04:00:00.000000000 +0400 |
| 165 |
|
|
+++ smeserver-qpsmtpd-2.6.0/root/usr/lib/systemd/system/sqpsmtpd.service 2020-11-27 23:39:09.249000000 +0400 |
| 166 |
|
|
@@ -0,0 +1,15 @@ |
| 167 |
|
|
+[Unit] |
| 168 |
|
|
+Description=sqpsmtpd |
| 169 |
|
|
+After=network.target |
| 170 |
|
|
+Conflicts=prosqpsmtpdd.service |
| 171 |
|
|
+ |
| 172 |
|
|
+[Service] |
| 173 |
|
|
+Type=oneshot |
| 174 |
|
|
+ExecStartPre=/sbin/e-smith/service-status sqpsmtpd |
| 175 |
|
|
+ExecStart=/usr/bin/sv u /service/sqpsmtpd |
| 176 |
|
|
+ExecStop=/usr/bin/sv stop /service/sqpsmtpd |
| 177 |
|
|
+ExecReload=/usr/bin/sv t /service/sqpsmtpd |
| 178 |
|
|
+RemainAfterExit=yes |
| 179 |
|
|
+ |
| 180 |
|
|
+[Install] |
| 181 |
|
|
+WantedBy=sme-server.target |
| 182 |
|
|
diff -urN smeserver-qpsmtpd-2.6.0.old/root/usr/lib/systemd/system-preset/80-koozali-qpsmtpd.preset smeserver-qpsmtpd-2.6.0/root/usr/lib/systemd/system-preset/80-koozali-qpsmtpd.preset |
| 183 |
|
|
--- smeserver-qpsmtpd-2.6.0.old/root/usr/lib/systemd/system-preset/80-koozali-qpsmtpd.preset 1970-01-01 04:00:00.000000000 +0400 |
| 184 |
|
|
+++ smeserver-qpsmtpd-2.6.0/root/usr/lib/systemd/system-preset/80-koozali-qpsmtpd.preset 2020-11-27 23:34:36.880000000 +0400 |
| 185 |
|
|
@@ -0,0 +1,2 @@ |
| 186 |
|
|
+enable qpsmtpd.service |
| 187 |
|
|
+enable sqpsmtpd.service |
Parent Directory
| 
Revision Log
| 
Revision Graph
