From 972532f22e23fb4d1c47226d2d024775b76858a7 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Fri, 17 Jan 2025 06:25:02 +0100
Subject: [PATCH] daily autocommit

---
 .etckeeper                       | 12 ++++++++++--
 dovecot/dovecot.conf             |  3 +++
 postfix/postscreen_access.cidr   |  2 +-
 rspamd/local.d/dkim_signing.conf |  4 ++++
 rspamd/override.d/options.inc    |  6 ++++++
 5 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 rspamd/override.d/options.inc

diff --git a/.etckeeper b/.etckeeper
index 973737a..329c753 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -29,7 +29,6 @@ mkdir -p './network/interfaces.d'
 mkdir -p './opt'
 mkdir -p './postfix/dynamicmaps.cf.d'
 mkdir -p './postfix/sasl'
-mkdir -p './rspamd/override.d'
 mkdir -p './security/limits.d'
 mkdir -p './security/namespace.d'
 mkdir -p './ssh/ssh_config.d'
@@ -623,14 +622,22 @@ maybe chmod 0640 'dovecot/dovecot-dict-auth.conf.ext'
 maybe chgrp 'dovecot' 'dovecot/dovecot-dict-sql.conf.ext'
 maybe chmod 0640 'dovecot/dovecot-dict-sql.conf.ext'
 maybe chmod 0644 'dovecot/dovecot-helga.conf'
+maybe chown 'dovecot' 'dovecot/dovecot-last-login.conf'
+maybe chgrp 'dovecot' 'dovecot/dovecot-last-login.conf'
 maybe chmod 0644 'dovecot/dovecot-last-login.conf'
-maybe chmod 0600 'dovecot/dovecot-master-users'
+maybe chown 'dovecot' 'dovecot/dovecot-master-users'
+maybe chgrp 'dovecot' 'dovecot/dovecot-master-users'
+maybe chmod 0400 'dovecot/dovecot-master-users'
 maybe chmod 0640 'dovecot/dovecot-mysql.conf'
 maybe chmod 0644 'dovecot/dovecot-orig.conf'
 maybe chmod 0644 'dovecot/dovecot-prd-imap01.conf'
+maybe chown 'dovecot' 'dovecot/dovecot-share-folder.conf'
+maybe chgrp 'dovecot' 'dovecot/dovecot-share-folder.conf'
 maybe chmod 0644 'dovecot/dovecot-share-folder.conf'
 maybe chgrp 'dovecot' 'dovecot/dovecot-sql.conf.ext'
 maybe chmod 0640 'dovecot/dovecot-sql.conf.ext'
+maybe chown 'dovecot' 'dovecot/dovecot-used-quota.conf'
+maybe chgrp 'dovecot' 'dovecot/dovecot-used-quota.conf'
 maybe chmod 0644 'dovecot/dovecot-used-quota.conf'
 maybe chmod 0644 'dovecot/dovecot.conf'
 maybe chmod 0644 'dovecot/dovecot.conf.new'
@@ -1184,6 +1191,7 @@ maybe chmod 0644 'rspamd/modules.d/url_redirector.conf'
 maybe chmod 0644 'rspamd/modules.d/whitelist.conf'
 maybe chmod 0644 'rspamd/options.inc'
 maybe chmod 0755 'rspamd/override.d'
+maybe chmod 0644 'rspamd/override.d/options.inc'
 maybe chmod 0644 'rspamd/rspamd.conf'
 maybe chmod 0755 'rspamd/scores.d'
 maybe chmod 0644 'rspamd/scores.d/content_group.conf'
diff --git a/dovecot/dovecot.conf b/dovecot/dovecot.conf
index eb27550..738441b 100644
--- a/dovecot/dovecot.conf
+++ b/dovecot/dovecot.conf
@@ -93,6 +93,9 @@ mail_plugins = quota mailbox_alias acl mail_log notify
 namespace inbox {
   #type = private
   inbox = yes
+  type = private
+  separator = /
+  prefix =
 
   # These mailboxes are widely used and could perhaps be created automatically:
   mailbox Drafts {
diff --git a/postfix/postscreen_access.cidr b/postfix/postscreen_access.cidr
index 4996337..044a1ef 100644
--- a/postfix/postscreen_access.cidr
+++ b/postfix/postscreen_access.cidr
@@ -6,4 +6,4 @@
 127.0.0.0/8			permit
 217.66.51.28/32			permit
 ::1				permit
-fe80::250:56ff:fe9f:7e37/64	permit
+fe80::/64			permit
diff --git a/rspamd/local.d/dkim_signing.conf b/rspamd/local.d/dkim_signing.conf
index f0db219..bf34ed8 100644
--- a/rspamd/local.d/dkim_signing.conf
+++ b/rspamd/local.d/dkim_signing.conf
@@ -12,5 +12,9 @@ domain {
         selector = "mail-2025-01-14-0";
         path = "/var/lib/rspamd/dkim/wildpark.de.mail-2025-01-14-0.key";
     }
+    pixelpark.com {
+        selector = "mail-2023-05-22";
+        path = "/var/lib/rspamd/dkim/pixelpark.com.mail-2023-05-22.key";
+    }
 }
 use_esld = true;
diff --git a/rspamd/override.d/options.inc b/rspamd/override.d/options.inc
new file mode 100644
index 0000000..a4624b4
--- /dev/null
+++ b/rspamd/override.d/options.inc
@@ -0,0 +1,6 @@
+# Basic rspamd configuration
+
+# Local networks
+local_addrs = [217.66.51.0/24, fd00::/8, 169.254.0.0/16, fe80::/10];
+
+
-- 
2.39.5