Specify Rspamd version

[cfis]

When using the Helm chart, the docker-mailserver pod name changes with each update/reinstall because the host name changes (ie,the pod name changes). This causes Rsampd to lose its history because it uses a redis key to store the history which is based on the host name.

I submitted an issue to rsampd - see rspamd/rspamd#4801. They were nice enough to fix this by allowing the redis variable name to be set via a template. This change was released in version 3.8.2 - see https://github.com/rspamd/rspamd/releases/tag/3.8.2.

I would like to be able to use this new version of rspamd and also be able to set history key_prefix.

Thanks!

[polarathene]

I would like to be able to use this new version of rspamd and also be able to set history key_prefix.

That is managed by @georglauterbach , AFAIK we use packages from official Rspamd PPA:

docker-mailserver/target/scripts/build/packages.sh

Lines 166 to 179 in 899b644

	function _install_rspamd() {
	_log 'debug' 'Installing Rspamd'
	_log 'trace' 'Adding Rspamd PPA'
	curl -sSfL https://rspamd.com/apt-stable/gpg.key | gpg --dearmor >/etc/apt/trusted.gpg.d/rspamd.gpg
	echo \
	"deb [signed-by=/etc/apt/trusted.gpg.d/rspamd.gpg] http://rspamd.com/apt-stable/ ${VERSION_CODENAME} main" \
	>/etc/apt/sources.list.d/rspamd.list
	_log 'trace' 'Updating package index after adding PPAs'
	apt-get "${QUIET}" update
	_log 'trace' 'Installing actual package'
	apt-get "${QUIET}" install rspamd redis-server
	}

There might be some changes there that you have to wait for until v14. Doesn't seem like we have any version pinning in place so I'm not sure how @georglauterbach manages that. DMS doesn't update existing tagged releases when published, so they may not always be equivalent to a local build.

Perhaps try a local build with :edge?

---

docker-mailserver pod name changes with each update/reinstall because the host name changes (ie,the pod name changes). This causes Rsampd to lose its history because it uses a redis key to store the history which is based on the host name.

That is an example of the concerns with plans for #3520

It is not always obvious or clear when software is relying on the hostname implicitly for config/operation unfortunately. Thanks for identifying another one and getting that resolved upstream! 🙏

[georglauterbach]

When the changes have been published in the PPA, theoretically, the next build for :edge should catch the latest version of Rspamd (note: it's not Rsampd but Rspamd 😄). Then, it should be an easy fix, just adding the file in target/rspamd/local.d/history_redis.conf with contents

key_prefix = "rs_history{{COMPRESS}}";

The file should be created in this function:

docker-mailserver/target/scripts/startup/setup.d/security/rspamd.sh

Lines 120 to 146 in d227d6d

	function __rspamd__setup_redis() {
	if _env_var_expect_zero_or_one 'ENABLE_RSPAMD_REDIS' && [[ ${ENABLE_RSPAMD_REDIS} -eq 1 ]]; then
	__rspamd__log 'debug' 'Internal Redis is enabled, adding configuration'
	cat >"${RSPAMD_LOCAL_D}/redis.conf" << "EOF"
	# documentation: https://rspamd.com/doc/configuration/redis.html
	servers = "127.0.0.1:6379";
	expand_keys = true;
	EOF
	# Here we adjust the Redis default configuration that we supply to Redis when starting it.
	# NOTE: `/var/lib/redis/` is symlinked to `/var/mail-state/redis/` when DMS is started
	# with a volume mounted to `/var/mail-state/` for data persistence.
	sedfile -i -E \
	-e 's|^(bind).*|\1 127.0.0.1|g' \
	-e 's|^(daemonize).*|\1 no|g' \
	-e 's|^(port).*|\1 6379|g' \
	-e 's|^(loglevel).*|\1 warning|g' \
	-e 's|^(logfile).*|\1 ""|g' \
	-e 's|^(dir).*|\1 /var/lib/redis|g' \
	-e 's|^(dbfilename).*|\1 dms-dump.rdb|g' \
	/etc/redis/redis.conf
	else
	__rspamd__log 'debug' 'Rspamd will not use internal Redis (which has been disabled)'
	fi
	}

Because there might exist users who use a dedicated Redis instance. I.e., we need a second HERDOC:

     cat >"${RSPAMD_LOCAL_D}/history_redis.conf" << "EOF" 
# documentation: https://rspamd.com/doc/modules/history_redis.html

key_prefix = "rs_history{{COMPRESS}}";
  
EOF

I can provide a PR for that.