From 5c156f1c8d0b1b36e743ebeeb05222b2bea65e77 Mon Sep 17 00:00:00 2001
From: Patrick Niebeling <patrick.niebeling@adacor.com>
Date: Wed, 6 Nov 2024 21:16:50 +0100
Subject: [PATCH] Fix

Signed-off-by: Patrick Niebeling <patrick.niebeling@adacor.com>
---
 Stable2.0/Dockerfile           |  5 ++++-
 Stable2.0/docker-entrypoint.sh | 18 ------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/Stable2.0/Dockerfile b/Stable2.0/Dockerfile
index 1dcfade..afabd73 100644
--- a/Stable2.0/Dockerfile
+++ b/Stable2.0/Dockerfile
@@ -43,6 +43,9 @@ HEALTHCHECK --interval=1m --timeout=5s --start-period=10s \
 
 # Run Rspamd
 ENTRYPOINT ["/docker-entrypoint.sh"]
+
+STOPSIGNAL SIGTERM
+
 CMD ["/usr/bin/rspamd", "-f", "-u", "_rspamd", "-g", "_rspamd"]
 
 # Setup Labels
@@ -60,4 +63,4 @@ LABEL org.label-schema.name="Rspamd" \
   org.label-schema.version=$VERSION \
   org.label-schema.vcs-url="https://github.com/rspamd/rspamd/" \
   org.label-schema.vcs-ref=$COMMIT \
-  org.label-schema.build-date=$DATE \
+  org.label-schema.build-date=$DATE \
\ No newline at end of file
diff --git a/Stable2.0/docker-entrypoint.sh b/Stable2.0/docker-entrypoint.sh
index 969507e..70e7ae4 100644
--- a/Stable2.0/docker-entrypoint.sh
+++ b/Stable2.0/docker-entrypoint.sh
@@ -1,19 +1,10 @@
 #!/bin/bash
 
-# mkdir -p /etc/rspamd/plugins.d \
-#   /etc/rspamd/custom
-
-# touch /etc/rspamd/rspamd.conf.local \
-#   /etc/rspamd/rspamd.conf.override
-
 chmod 755 /var/lib/rspamd
 
 
 [[ ! -f /etc/rspamd/override.d/worker-controller-password.inc ]] && echo '# Autogenerated' > /etc/rspamd/override.d/worker-controller-password.inc
 
-# Provide additional lua modules
-ln -s /usr/lib/$(uname -m)-linux-gnu/liblua5.1-cjson.so.0.0.0 /usr/lib/rspamd/cjson.so
-
 chown -R _rspamd:_rspamd /var/lib/rspamd \
   /etc/rspamd/local.d \
   /etc/rspamd/custom \
@@ -43,19 +34,10 @@ touch /etc/rspamd/custom/global_mime_from_blacklist.map \
   /etc/rspamd/custom/bulk_header.map \
   /etc/rspamd/custom/bad_header.map
 
-# www-data (82) group needs to write to these files
 chown _rspamd:_rspamd /etc/rspamd/custom/
 chmod 0755 /etc/rspamd/custom/.
 chmod 644 -R /etc/rspamd/custom/*
 
-# Run hooks
-for file in /hooks/*; do
-  if [ -x "${file}" ]; then
-    echo "Running hook ${file}"
-    "${file}"
-  fi
-done
-
 # If DQS KEY is set in mailcow.conf add Spamhaus DQS RBLs
 if [[ ! -z ${SPAMHAUS_DQS_KEY} ]]; then
     cat <<EOF > /etc/rspamd/custom/dqs-rbl.conf