software/mail-server: remove PID files created by dovecot and postfix

software/mail-server/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 7ab3b606972e1b338d28fc1374617835
 
 [template-default]
 _update_hash_filename_ = instance-default.cfg.in
-md5sum = 698104b7c3694a69575c965c21629f87
+md5sum = 89a7224c3dd9356bf262100816b67f73
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf

software/mail-server/instance-default.cfg.in

@@ -147,6 +147,10 @@ recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
 inline =
   #!/bin/sh
+  # If master.pid contains PID of any running process
+  # dovecot will refuse to run. Only the pidfile provided
+  # by wrapper recipe should be used
+  rm -f var/run/dovecot/master.pid
   {{ dovecot_binary }} -F -c ${dovecot-conf:output}
 
 [dovecot-service]
@@ -170,6 +174,7 @@ recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
 inline =
   #!/bin/sh
+  rm -f var/spool/postfix/pid/master.pid
   ${directory:usr-postfix}/libexec/postfix/master -c ${directory:etc-postfix}
 
 [postfix-service]