Merge branch 'exim-config-permissions' into 'buster-testing'

Fix permissions issue with exim config (buster)

See merge request sympl/sympl!138

mail/debian/changelog

+sympl-mail (10.0.191004.0) stable; urgency=medium
+
+  * Fixes permissions issue with configs
+
+ -- Paul Cammish <sympl@kelduum.net>  Fri, 04 Oct 2019 13:03:16 +0100
+ 
 sympl-mail (10.0.190917.0) stable; urgency=medium
 
   * Adds full chain to Dovecot SNI, needed by some clients.

mail/debian/postinst

@@ -143,6 +143,12 @@ if [ -x /usr/sbin/sympl-mail-dovecot-sni ] ; then
   /usr/sbin/sympl-mail-dovecot-sni
 fi
 
+#
+# Add the Debian-exim user to the sympl group
+#
+if [ "$( groups Debian-exim | grep -c sympl )" == 0 ]; then
+  usermod -a -G sympl Debian-exim
+fi
 
 #
 #  Restart all deamons

mail/exim4/sympl.d/20-routers/26-vhost-default-forward

@@ -8,6 +8,8 @@ vhost_default_forward:
   # Set permissions
   user  = ${extract{uid}{${stat:VHOST_DIR/$domain/VHOST_CONFIG_DIR}}}
   group = ${extract{gid}{${stat:VHOST_DIR/$domain/VHOST_CONFIG_DIR}}}
+  # Ignore if world writable
+  modemask = 002
   # Set the router/transport home directory
   router_home_directory = ${if exists{VHOST_DIR/$domain/VHOST_MAILBOX_DIR/$local_part}{VHOST_DIR/$domain/VHOST_MAILBOX_DIR/$local_part}{VHOST_DIR/$domain}}