diff -urN smeserver-qpsmtpd-2.6.0.old/createlinks smeserver-qpsmtpd-2.6.0/createlinks --- smeserver-qpsmtpd-2.6.0.old/createlinks 2020-11-27 22:53:35.000000000 +0400 +++ smeserver-qpsmtpd-2.6.0/createlinks 2020-11-27 23:34:15.603000000 +0400 @@ -8,6 +8,7 @@ domain-create domain-delete bootstrap-console-save + smeserver-qpsmtpd-update )) { event_link("domains-update-dkim", $event, "30"); @@ -18,6 +19,7 @@ foreach $event (qw( network-create network-delete + smeserver-qpsmtpd-update )) { templates2events("$service/config/relayclients", $event); @@ -29,6 +31,7 @@ email-update network-create network-delete + smeserver-qpsmtpd-update )) { templates2events("$service/peers/0", $event); @@ -42,6 +45,7 @@ bootstrap-console-save console-save email-update + smeserver-qpsmtpd-update )); templates2events("$service/ssl/cert.pem", qw( @@ -49,12 +53,14 @@ console-save email-update ssl-update + smeserver-qpsmtpd-update )); templates2events($_, qw( bootstrap-console-save console-save email-update + smeserver-qpsmtpd-update )) for (qw( /etc/mail-dmarc.ini @@ -67,6 +73,7 @@ bootstrap-console-save console-save email-update + smeserver-qpsmtpd-update )); my $control = "/var/qmail/control"; @@ -74,6 +81,7 @@ bootstrap-console-save console-save email-update + smeserver-qpsmtpd-update )); templates2events("$control/badrcptto", qw( bootstrap-console-save @@ -90,6 +98,7 @@ pseudonym-create pseudonym-delete pseudonym-modify + smeserver-qpsmtpd-update )); my $config = "/var/service/qpsmtpd/config"; @@ -97,6 +106,7 @@ bootstrap-console-save console-save email-update + smeserver-qpsmtpd-update )) for (qw( IP @@ -135,17 +145,21 @@ pseudonym-create pseudonym-delete pseudonym-modify + smeserver-qpsmtpd-update )); templates2events("$config/$_", qw( ssl-update + smeserver-qpsmtpd-update )) for (qw( tls_before_auth tls_ciphers tls_protocols )); + templates2events("$config/badhelo", 'ip-change'); + templates2events("$config/goodrcptto", qw( bootstrap-console-save email-update @@ -160,6 +174,7 @@ group-create group-delete group-modify + smeserver-qpsmtpd-update )); safe_touch("root/etc/e-smith/templates/$config/forcespamcheck/template-begin"); @@ -177,6 +192,7 @@ group-create group-delete group-modify + smeserver-qpsmtpd-update )); @@ -196,13 +212,20 @@ } safe_symlink("daemontools", "root/etc/rc.d/init.d/qpsmtpd"); -service_link_enhanced("qpsmtpd", "S85", "7"); +#service_link_enhanced("qpsmtpd", "S85", "7"); service_link_enhanced("qpsmtpd", "K55", "6"); service_link_enhanced("qpsmtpd", "K55", "0"); service_link_enhanced("qpsmtpd", "K55", "1"); safe_symlink("daemontools", "root/etc/rc.d/init.d/sqpsmtpd"); -service_link_enhanced("sqpsmtpd", "S85", "7"); +#service_link_enhanced("sqpsmtpd", "S85", "7"); service_link_enhanced("sqpsmtpd", "K55", "6"); service_link_enhanced("sqpsmtpd", "K55", "0"); service_link_enhanced("sqpsmtpd", "K55", "1"); + +my $event = 'smeserver-qpsmtpd-update'; +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/qpsmtpd"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/sqpsmtpd"); +templates2events("/etc/systemd/system-preset/49-koozali.preset", $event); +event_link("systemd-reload", $event, "94"); +event_link("reset-unsavedflag", $event, "95"); 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 --- smeserver-qpsmtpd-2.6.0.old/root/usr/lib/systemd/system/qpsmtpd.service 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-qpsmtpd-2.6.0/root/usr/lib/systemd/system/qpsmtpd.service 2020-11-27 23:39:23.913000000 +0400 @@ -0,0 +1,15 @@ +[Unit] +Description=qpsmtpd +After=network.target +Conflicts=proqpsmtpdd.service + +[Service] +Type=oneshot +ExecStartPre=/sbin/e-smith/service-status qpsmtpd +ExecStart=/usr/bin/sv u /service/qpsmtpd +ExecStop=/usr/bin/sv stop /service/qpsmtpd +ExecReload=/usr/bin/sv t /service/qpsmtpd +RemainAfterExit=yes + +[Install] +WantedBy=sme-server.target 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 --- smeserver-qpsmtpd-2.6.0.old/root/usr/lib/systemd/system/sqpsmtpd.service 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-qpsmtpd-2.6.0/root/usr/lib/systemd/system/sqpsmtpd.service 2020-11-27 23:39:09.249000000 +0400 @@ -0,0 +1,15 @@ +[Unit] +Description=sqpsmtpd +After=network.target +Conflicts=prosqpsmtpdd.service + +[Service] +Type=oneshot +ExecStartPre=/sbin/e-smith/service-status sqpsmtpd +ExecStart=/usr/bin/sv u /service/sqpsmtpd +ExecStop=/usr/bin/sv stop /service/sqpsmtpd +ExecReload=/usr/bin/sv t /service/sqpsmtpd +RemainAfterExit=yes + +[Install] +WantedBy=sme-server.target 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 --- smeserver-qpsmtpd-2.6.0.old/root/usr/lib/systemd/system-preset/80-koozali-qpsmtpd.preset 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-qpsmtpd-2.6.0/root/usr/lib/systemd/system-preset/80-koozali-qpsmtpd.preset 2020-11-27 23:34:36.880000000 +0400 @@ -0,0 +1,2 @@ +enable qpsmtpd.service +enable sqpsmtpd.service