diff -Nur --no-dereference smeserver-dovecot-1.6.0.old/createlinks smeserver-dovecot-1.6.0/createlinks
--- smeserver-dovecot-1.6.0.old/createlinks	2021-05-30 23:21:05.408000000 -0400
+++ smeserver-dovecot-1.6.0/createlinks	2021-05-30 23:32:52.632000000 -0400
@@ -4,6 +4,7 @@
 
 
 templates2events("/etc/dovecot/dovecot.conf", qw(email-update bootstrap-console-save ssl-update smeserver-dovecot-update ip-change));
+templates2events("/etc/dovecot/ssl/imapd.pem", qw(email-update bootstrap-console-save ssl-update smeserver-dovecot-update ip-change));
 templates2events("/etc/dovecot/master.users", qw(email-update bootstrap-console-save smeserver-dovecot-update));
 templates2events("/etc/pam.d/dovecotadmin", qw(email-update bootstrap-console-save smeserver-dovecot-update));
 
@@ -21,7 +22,6 @@
 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
 safe_symlink("sigusr2", "root/etc/e-smith/events/ip-change/services2adjust/dovecot");
 
diff -Nur --no-dereference 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	2021-05-30 23:21:05.409000000 -0400
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf/40service	2021-05-30 23:37:02.118000000 -0400
@@ -5,6 +5,6 @@
 ExecStartPre=-/sbin/e-smith/service-status dovecot
 ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/dovecot.conf
 ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/master.users
-ExecStartPre=-/sbin/e-smith/systemd/dovecot-control
+ExecStartPre=-/sbin/e-smith/expand-template /etc/dovecot/ssl/imapd.pem
 ExecStartPre=-/usr/sbin/portrelease dovecot
 Restart=always
diff -Nur --no-dereference smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/imapd.pem smeserver-dovecot-1.6.0/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/imapd.pem
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/imapd.pem	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates.metadata/etc/dovecot/ssl/imapd.pem	2021-05-30 23:25:02.061000000 -0400
@@ -0,0 +1,4 @@
+TEMPLATE_PATH="/home/e-smith/ssl.pem"
+OUTPUT_FILENAME="/etc/dovecot/ssl/imapd.pem"
+GID="stunnel"
+PERMS=0640
diff -Nur --no-dereference smeserver-dovecot-1.6.0.old/root/sbin/e-smith/systemd/dovecot-control smeserver-dovecot-1.6.0/root/sbin/e-smith/systemd/dovecot-control
--- smeserver-dovecot-1.6.0.old/root/sbin/e-smith/systemd/dovecot-control	2021-05-30 23:21:05.410000000 -0400
+++ smeserver-dovecot-1.6.0/root/sbin/e-smith/systemd/dovecot-control	1969-12-31 19:00:00.000000000 -0500
@@ -1,41 +0,0 @@
-#!/usr/bin/perl -w
-
-#----------------------------------------------------------------------
-# copyright (C) 2011 Firewall-Services
-# daniel@firewall-services.com
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#               
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#               
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-#----------------------------------------------------------------------
-
-
-use esmith::util;
-use esmith::ConfigDB;
-use File::Copy;
-
-my $c = esmith::ConfigDB->open_ro;
-my $s = $c->get('SystemName')->value;
-my $d = $c->get('DomainName')->value;
-
-my $pem = "/etc/dovecot/ssl/imapd.pem";
-# Now copy system pem file into jail used by ldap
-copy("/home/e-smith/ssl.pem/$s.$d.pem", "$pem.$$")
-  or die "failed to copy SSL PEM: $!";
-chmod 0440, "$pem.$$";
-esmith::util::chownFile("root", "stunnel", "$pem.$$");
-rename("$pem.$$", "$pem")
-  or die "failed to rename $pem.$$ to $pem: $!";
-
-