Merge branch 'buster-testing' into 'buster'

buster-testing -> buster

See merge request sympl/sympl!180

CHANGELOG

 CHANGELOG
 ---------
 
+2020-04-20
+  sympl-core
+    * Prevent sympl-filesystem-security from changing permissions of /etc/firewall/local.d/ contents.
+
 2020-04-18
   sympl-mail
     * Fixed sympl-mail-dovecot-sni issue with filesystem loops (#281)

core/debian/changelog

+sympl-core (10.0.200420.0) stable; urgency=medium
+
+  * Prevent sympl-filesystem-security from changing permissions of /etc/firewall/local.d/ contents.
+
+ -- Paul Cammish <sympl@kelduum.net>  Mon, 20 Apr 2020 15:15:06 +0100
+
 sympl-core (10.0.200415.0) stable; urgency=medium
 
   * Added --verbose switch to sympl-filesystem-security

core/sbin/sympl-filesystem-security

@@ -140,9 +140,9 @@ fi
 
 if [ -d /etc/sympl ]; then
 
-  find "/etc/sympl" ! -type l ! -path '*/test.d/*' \( ! -user sympl -o ! -group sympl \) $VERBOSE -exec echo chown sympl:sympl {} \;
+  find "/etc/sympl" ! -type l ! -path '*/test.d/*' ! -path '*/firewall/local.d/*' \( ! -user sympl -o ! -group sympl \) $VERBOSE -exec echo chown sympl:sympl {} \;
 
-  find "/etc/sympl" ! -type l ! -path '*/test.d/*' \( -type f ! -perm 664 $VERBOSE -exec chmod 664 {} \; -o -type d ! -perm 775 $VERBOSE -exec chmod 775 {} \; \)
+  find "/etc/sympl" ! -type l ! -path '*/test.d/*' ! -path '*/firewall/local.d/*' \( -type f ! -perm 664 $VERBOSE -exec chmod 664 {} \; -o -type d ! -perm 775 $VERBOSE -exec chmod 775 {} \; \)
 
 fi