put mail templates on data share

remove create-orders.patch

Dockerfile

@@ -36,7 +36,6 @@ RUN mkdir -p /eressea/server && \
 FROM eressea-base as eressea
 ARG eressea_branch
 COPY docker-assets/backup-eressea.patch /eressea/
-COPY docker-assets/create-orders.patch /eressea/
 RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \
     cmake luarocks libxml2-dev liblua5.2-dev libtolua-dev libncurses5-dev libsqlite3-dev \
     libexpat1-dev && \
@@ -80,6 +79,8 @@ COPY docker-assets/lua-scripts/ /eressea/lua-scripts/
 COPY docker-assets/run-eressea.sh /eressea/run-eressea.sh
 COPY docker-assets/start.sh /eressea/start.sh
 COPY --from=eressea /eressea/server/ /eressea/server/
+COPY --from=eressea /eressea/server/etc/report-mail.de.txt /eressea/template-mail/report-mail.de.txt
+COPY --from=eressea /eressea/server/etc/report-mail.en.txt /eressea/template-mail/report-mail.en.txt
 COPY --from=eressea /eressea/git.eressea/scripts/tools /eressea/server/scripts/tools
 COPY --from=eressea /eressea/git.eressea/s/preview /eressea/server/bin/
 COPY --from=eressea /usr/games/echeck /usr/games/echeck

docker-assets/start.sh

@@ -120,10 +120,18 @@ cmd_startup() {
 
     mkdir -p /data/game-1
     mkdir -p /data/game-1/backup
-    ln -sf /data/server/scripts/config.lua /data/game-1/config.lua
+    ln -sf /eressea/server/scripts/config.lua /data/game-1/config.lua
-    ln -sf /data/server/bin/eressea /data/game-1/eressea
+    ln -sf /eressea/server/bin/eressea /data/game-1/eressea
-    ln -sf /data/server/scripts/reports.lua /data/game-1/reports.lua
+    ln -sf /eressea/server/scripts/reports.lua /data/game-1/reports.lua
-    ln -sf /data/server/scripts/run-turn.lua /data/game-1/run-turn.lua
+    ln -sf /eressea/server/scripts/run-turn.lua /data/game-1/run-turn.lua
+
+    mkdir -p /eressea/server/etc
+    [ -e /eressea/server/etc/report-mail.de.txt ] && rm -f /eressea/server/etc/report-mail.de.txt
+    [ -e /eressea/server/etc/report-mail.en.txt ] && rm -f /eressea/server/etc/report-mail.en.txt
+    [ -e /eressea/server/etc/report-mail.txt ] && rm -f /eressea/server/etc/report-mail.txt
+    ln -sf /data/config/report-mail.de.txt /eressea/server/etc/report-mail.de.txt
+    ln -sf /data/config/report-mail.en.txt /eressea/server/etc/report-mail.en.txt
+    ln -sf /data/config/report-mail.de.txt /eressea/server/etc/report-mail.txt
 
     cd /data/game-1
     echo "Eressea environment setup complete"
@@ -314,19 +322,25 @@ cmd_generate() {
         cat /data/game-1/eressea.ini > $tmpfile
         cat /data/config/mail.ini >> $tmpfile
 
-        [ -e /data/config/fetchmailrc ] && [ $force == 0 ] && rm -f /data/config/fetchmailrc
+        [ -e /data/config/fetchmailrc ] && [ $force == 1 ] && rm -f /data/config/fetchmailrc
         [ ! -e /data/config/fetchmailrc ] && j2 -f ini /eressea/template-config/fetchmailrc $tmpfile > /data/config/fetchmailrc
         chmod 700 /data/config/fetchmailrc
 
-        [ -e /data/config/procmailrc ] && [ $force == 0 ] && rm -f /data/config/procmailrc
+        [ -e /data/config/procmailrc ] && [ $force == 1 ] && rm -f /data/config/procmailrc
         [ ! -e /data/config/procmailrc ] && j2 -f ini /eressea/template-config/procmailrc $tmpfile > /data/config/procmailrc
 
-        [ -e /data/config/muttrc ] && [ $force == 0 ] && rm -f /data/config/muttrc
+        [ -e /data/config/muttrc ] && [ $force == 1 ] && rm -f /data/config/muttrc
         [ ! -e /data/config/muttrc ] && j2 -f ini /eressea/template-config/muttrc $tmpfile > /data/config/muttrc
 
-        [ -e /data/config/logrotate ] && [ $force == 0 ] && rm -f /data/config/logrotate
+        [ -e /data/config/logrotate ] && [ $force == 1 ] && rm -f /data/config/logrotate
         [ ! -e /data/config/logrotate ] && cp /eressea/template-config/logrotate /data/config/logrotate
 
+        [ -e /data/config/report-mail.de.txt ] && [ $force == 1 ] && rm -f /data/config/report-mail.de.txt
+        [ ! -e /data/config/report-mail.de.txt ] && cp /eressea/template-mail/report-mail.de.txt /data/config/report-mail.de.txt
+
+        [ -e /data/config/report-mail.en.txt ] && [ $force == 1 ] && rm -f /data/config/report-mail.en.txt
+        [ ! -e /data/config/report-mail.en.txt ] && cp /eressea/template-mail/report-mail.en.txt /data/config/report-mail.en.txt
+
         rm -f $tmpfile
 
         mkdir -p /data/mail/cache

docker-assets/template-config/procmailrc

@@ -15,10 +15,12 @@ ERESSEA=/data
 
 :0:server.lock
 * ^Subject:.*{{game.mailcmd}} BEFEHLE
+* ^Subject:.*{{game.mailcmd}} 1 BEFEHLE
 | grep -v '>From' | /data/server/bin/orders-accept 1 de
 
 :0:server.lock
 * ^Subject:.*{{game.mailcmd}} ORDERS
+* ^Subject:.*{{game.mailcmd}} 1 ORDERS
 | grep -v '>From' | /data/server/bin/orders-accept 1 en
 
 :0: