diff --git a/.etckeeper b/.etckeeper index a5b84094..e981f630 100755 --- a/.etckeeper +++ b/.etckeeper @@ -348,11 +348,8 @@ maybe chmod 0644 'apt/sources.list.d/rspamd.list' maybe chmod 0644 'apt/sources.list.d/zerotier.list' maybe chmod 0755 'apt/trusted.gpg.d' maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bookworm-automatic.asc' -maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bookworm-automatic.gpg' maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bookworm-security-automatic.asc' -maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bookworm-security-automatic.gpg' maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bookworm-stable.asc' -maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bookworm-stable.gpg' maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bullseye-automatic.asc' maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bullseye-security-automatic.asc' maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-bullseye-stable.asc' @@ -3214,6 +3211,7 @@ maybe chmod 0644 'rspamd/modules.d/greylist.conf' maybe chmod 0644 'rspamd/modules.d/hfilter.conf' maybe chmod 0644 'rspamd/modules.d/history_redis.conf' maybe chmod 0644 'rspamd/modules.d/http_headers.conf' +maybe chmod 0644 'rspamd/modules.d/known_senders.conf' maybe chmod 0644 'rspamd/modules.d/maillist.conf' maybe chmod 0644 'rspamd/modules.d/metadata_exporter.conf' maybe chmod 0644 'rspamd/modules.d/metric_exporter.conf' diff --git a/X11/Xsession.d/20dbus_xdg-runtime b/X11/Xsession.d/20dbus_xdg-runtime index c5417277..2404378f 100644 --- a/X11/Xsession.d/20dbus_xdg-runtime +++ b/X11/Xsession.d/20dbus_xdg-runtime @@ -20,5 +20,9 @@ if [ -x "/usr/bin/dbus-update-activation-environment" ]; then # to put a minimal subset of the Xsession's environment in activated # services' environments dbus-update-activation-environment --verbose --systemd \ - DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY + DBUS_SESSION_BUS_ADDRESS \ + DISPLAY \ + XAUTHORITY \ + XDG_CURRENT_DESKTOP \ + ${NULL+} fi diff --git a/apt/trusted.gpg.d/debian-archive-bookworm-automatic.gpg b/apt/trusted.gpg.d/debian-archive-bookworm-automatic.gpg deleted file mode 100644 index dfd46c7f..00000000 Binary files a/apt/trusted.gpg.d/debian-archive-bookworm-automatic.gpg and /dev/null differ diff --git a/apt/trusted.gpg.d/debian-archive-bookworm-security-automatic.gpg b/apt/trusted.gpg.d/debian-archive-bookworm-security-automatic.gpg deleted file mode 100644 index 219463ce..00000000 Binary files a/apt/trusted.gpg.d/debian-archive-bookworm-security-automatic.gpg and /dev/null differ diff --git a/apt/trusted.gpg.d/debian-archive-bookworm-stable.gpg b/apt/trusted.gpg.d/debian-archive-bookworm-stable.gpg deleted file mode 100644 index 65216198..00000000 Binary files a/apt/trusted.gpg.d/debian-archive-bookworm-stable.gpg and /dev/null differ diff --git a/debian_version b/debian_version index 40e6bd96..5807e592 100644 --- a/debian_version +++ b/debian_version @@ -1 +1 @@ -12.1 +12.2 diff --git a/rspamd/modules.d/aws_s3.conf b/rspamd/modules.d/aws_s3.conf index bef592aa..5d781488 100644 --- a/rspamd/modules.d/aws_s3.conf +++ b/rspamd/modules.d/aws_s3.conf @@ -1,16 +1,16 @@ # Please don't modify this file as your changes might be overwritten with # the next update. # -# You can modify 'local.d/asn.conf' to add and merge +# You can modify 'local.d/aws_s3.conf' to add and merge # parameters defined inside this section # -# You can modify 'override.d/asn.conf' to strictly override all +# You can modify 'override.d/aws_s3.conf' to strictly override all # parameters defined inside this section # # See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories # for details # -# Module documentation can be found at https://rspamd.com/doc/modules/asn.html +# Module documentation can be found at https://rspamd.com/doc/modules/aws_s3.html aws_s3 { # Required attributes diff --git a/rspamd/modules.d/known_senders.conf b/rspamd/modules.d/known_senders.conf new file mode 100644 index 00000000..80b92390 --- /dev/null +++ b/rspamd/modules.d/known_senders.conf @@ -0,0 +1,31 @@ +# Please don't modify this file as your changes might be overwritten with +# the next update. +# +# You can modify 'local.d/known_senders.conf' to add and merge +# parameters defined inside this section +# +# You can modify 'override.d/known_senders.conf' to strictly override all +# parameters defined inside this section +# +# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories +# for details +# +# Module documentation can be found at https://rspamd.com/doc/modules/known_senders.html + +known_senders { + # This module is default-disabled + enabled = false; + + # Domains to track senders + domains = "https://maps.rspamd.com/freemail/free.txt.zst"; + # Maximum number of elements + max_senders = 100000; + # Maximum time to live (when not using bloom filters) + max_ttl = 30d; + # Use bloom filters (must be enabled in Redis as a plugin) + use_bloom = false; + + .include(try=true,priority=5) "${DBDIR}/dynamic/known_senders.conf" + .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/known_senders.conf" + .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/known_senders.conf" +} \ No newline at end of file diff --git a/rspamd/modules.d/redis.conf b/rspamd/modules.d/redis.conf index eb430cbb..24948b15 100644 --- a/rspamd/modules.d/redis.conf +++ b/rspamd/modules.d/redis.conf @@ -19,6 +19,7 @@ redis { #disabled_modules = ["ratelimit"]; # List of modules that should not use redis from this section #timeout = 1s; #db = "0"; + #username = "some_username"; #password = "some_password"; .include(try=true,priority=5) "${DBDIR}/dynamic/redis.conf" .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/redis.conf"