Syntax fixups for run

Author: astoltz

Dockerfile

@@ -1,8 +1,8 @@
 FROM alpine:3.23 AS builder
 
-ARG VERSION=2.0
+ARG VERSION=2.1
 ARG BUILD_DEPENDENCIES="gnutls-dev mariadb-dev sqlite-dev"
-ARG EXTRA_MODULES="m_mysql m_sqlite m_ssl_gnutls"
+ARG EXTRA_MODULES="mysql sqlite ssl_gnutls"
 
 RUN apk add --no-cache gcc g++ ninja git cmake $BUILD_DEPENDENCIES && \
     mkdir -p /src && \
@@ -43,4 +43,4 @@ VOLUME /data/
 
 USER anope
 
-CMD ["/anope/bin/services", "--nofork"]
+CMD ["/anope/bin/anope", "--nofork"]

conf/services.conf conf/anope.confconf/services.conf renamed to conf/anope.conf

@@ -673,7 +673,7 @@ include
 include
 {
 	type = "executable"
-	name = "/anope/conf/db.sh"
+	name = "/anope/conf/database.sh"
 }
 
 

conf/mail.sh

@@ -1,46 +1,19 @@
 #!/bin/sh
 
 if [ -z "$ANOPE_MAIL_REGISTRATION_MESSAGE" ]; then
-    ANOPE_MAIL_REGISTRATION_MESSAGE="Hi,
-
-				You have requested to register the nickname {nick} on {network}.
-				Please type \" /msg NickServ CONFIRM REGISTER {code} \" to complete registration.
-
-				If you don't know why this mail was sent to you, please ignore it silently.
-
-				{network} administrators."
+    ANOPE_MAIL_REGISTRATION_MESSAGE="Hi,\n\nYou have requested to register the nickname {nick} on {network}.\nPlease type \\\" /msg NickServ CONFIRM REGISTER {code} \\\" to complete registration.\n\nIf you don't know why this mail was sent to you, please ignore it silently.\n\n{network} administrators."
 fi
 
 if [ -z "$ANOPE_MAIL_RESET_MESSAGE" ]; then
-    ANOPE_MAIL_RESET_MESSAGE="Hi,
-
-			You have requested to have the password for {nick} reset.
-			To reset your password, type \" /msg NickServ CONFIRM RESETPASS {nick} {code} \"
-
-			If you don't know why this mail was sent to you, please ignore it silently.
-
-			{network} administrators."
+    ANOPE_MAIL_RESET_MESSAGE="Hi,\n\nYou have requested to have the password for {nick} reset.\nTo reset your password, type \\\" /msg NickServ CONFIRM RESETPASS {nick} {code} \\\"\n\nIf you don't know why this mail was sent to you, please ignore it silently.\n\n{network} administrators."
 fi
 
 if [ -z "$ANOPE_MAIL_EMAILCHANGE_MESSAGE" ]; then
-    ANOPE_MAIL_EMAILCHANGE_MESSAGE="Hi,
-
-			You have requested to change your email address from {old_email} to {new_email}.
-			Please type \" /msg NickServ CONFIRM EMAIL {code} \" to confirm this change.
-
-			If you don't know why this mail was sent to you, please ignore it silently.
-
-			{network} administrators."
+    ANOPE_MAIL_EMAILCHANGE_MESSAGE="Hi,\n\nYou have requested to change your email address from {old_email} to {new_email}.\nPlease type \\\" /msg NickServ CONFIRM EMAIL {code} \\\" to confirm this change.\n\nIf you don't know why this mail was sent to you, please ignore it silently.\n\n{network} administrators."
 fi
 
 if [ -z "$ANOPE_MAIL_MEMO_MESSAGE" ]; then
-    ANOPE_MAIL_MEMO_MESSAGE="Hi {receiver},
-
-			You've just received a new memo from {sender}. This is memo number {number}.
-
-			Memo text:
-
-			{text}"
+    ANOPE_MAIL_MEMO_MESSAGE="Hi {receiver},\n\nYou've just received a new memo from {sender}. This is memo number {number}.\n\nMemo text:\n\n{text}"
 fi
 
 cat <<EOF