--- rpms/smeserver-dovecot/sme10/smeserver-dovecot-1.6.0-bz11101-systemd.patch 2020/12/07 06:11:06 1.1 +++ rpms/smeserver-dovecot/sme10/smeserver-dovecot-1.6.0-bz11101-systemd.patch 2021/03/16 20:34:59 1.5 @@ -28,10 +28,10 @@ diff -Nur smeserver-dovecot-1.6.0.old/cr safe_symlink("restart", "root/etc/e-smith/events/smeserver-dovecot-update/services2adjust/dovecot"); +safe_symlink("restart", "root/etc/e-smith/events/smeserver-dovecot-update/services2adjust/rsyslog"); event_link("adjust-dovecot", "smeserver-dovecot-update", "02"); -+event_link("systemd-reload", $event, "89"); -+event_link("systemd-default", $event, "88"); -+templates2events("/etc/rsyslog.conf",$event); -+templates2events("/usr/lib/systemd/system/dovecot.service.d/50koozali.conf",$event); ++event_link("systemd-reload", "smeserver-dovecot-update", "89"); ++event_link("systemd-default", "smeserver-dovecot-update", "88"); ++templates2events("/etc/rsyslog.conf","smeserver-dovecot-update"); ++templates2events("/usr/lib/systemd/system/dovecot.service.d/50koozali.conf", qw(bootstrap-console-save console-save post-install post-upgrade smeserver-dovecot-update )); + # in case the ip change @@ -65,13 +65,13 @@ diff -Nur smeserver-dovecot-1.6.0.old/ro + +#dovecot +:programname, isequal, "dovecot" /var/log/dovecot/dovecot.log -+:programname, isequal, "dovecot" stop ++& stop + + diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/40service smeserver-dovecot-1.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/40service --- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/40service 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/40service 2020-12-03 23:24:00.397227278 -0500 -@@ -0,0 +1,9 @@ +@@ -0,0 +1,10 @@ +[Service] +#first we reset the ExecStartPre +ExecStartPre= @@ -81,6 +81,7 @@ diff -Nur smeserver-dovecot-1.6.0.old/ro +ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/master.users +ExecStartPre=-/sbin/e-smith/systemd/dovecot-control +ExecStartPre=-/usr/sbin/portrelease dovecot ++Restart=always diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/80install smeserver-dovecot-1.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/80install --- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/80install 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/80install 2020-12-03 23:18:07.193615380 -0500