aboutsummaryrefslogtreecommitdiff
path: root/services/templates
diff options
context:
space:
mode:
Diffstat (limited to 'services/templates')
-rw-r--r--services/templates/docker-compose.yaml.template2
-rw-r--r--services/templates/envs/auto-backup.env.template9
-rw-r--r--services/templates/envs/mailserver.env.template (renamed from services/templates/envs/mailserver.env)18
3 files changed, 15 insertions, 14 deletions
diff --git a/services/templates/docker-compose.yaml.template b/services/templates/docker-compose.yaml.template
index e133462..ddd3c95 100644
--- a/services/templates/docker-compose.yaml.template
+++ b/services/templates/docker-compose.yaml.template
@@ -47,7 +47,7 @@ services:
restart: on-failure:3
mailserver:
- image: docker.io/mailserver/docker-mailserver:latest
+ image: ghcr.io/docker-mailserver/docker-mailserver:latest
pull_policy: always
container_name: mailserver
hostname: mail.@@CRUPEST_DOMAIN@@
diff --git a/services/templates/envs/auto-backup.env.template b/services/templates/envs/auto-backup.env.template
index c2a6ba9..59d5fed 100644
--- a/services/templates/envs/auto-backup.env.template
+++ b/services/templates/envs/auto-backup.env.template
@@ -1,4 +1,5 @@
-CRUPEST_AUTO_BACKUP_COS_ENDPOINT=@@CRUPEST_AUTO_BACKUP_COS_ENDPOINT@@
-CRUPEST_AUTO_BACKUP_COS_BUCKET=@@CRUPEST_AUTO_BACKUP_COS_BUCKET@@
-CRUPEST_AUTO_BACKUP_COS_SECRET_ID=@@CRUPEST_AUTO_BACKUP_COS_SECRET_ID@@
-CRUPEST_AUTO_BACKUP_COS_SECRET_KEY=@@CRUPEST_AUTO_BACKUP_COS_SECRET_KEY@@
+RCLONE_S3_PROVIDER=@@CRUPEST_AUTO_BACKUP_S3_PROVIDER@@
+RCLONE_S3_ENDPOINT=@@CRUPEST_AUTO_BACKUP_S3_ENDPOINT@@
+RCLONE_S3_ACCESS_KEY_ID=@@CRUPEST_AUTO_BACKUP_S3_ACCESS_KEY_ID@@
+RCLONE_S3_SECRET_ACCESS_KEY=@@CRUPEST_AUTO_BACKUP_S3_ACCESS_KEY_SECRET@@
+CRUPEST_AUTO_BACKUP_S3_BUCKET=@@CRUPEST_AUTO_BACKUP_S3_BUCKET@@
diff --git a/services/templates/envs/mailserver.env b/services/templates/envs/mailserver.env.template
index 9b12dfe..dffb0e8 100644
--- a/services/templates/envs/mailserver.env
+++ b/services/templates/envs/mailserver.env.template
@@ -89,10 +89,10 @@ TLS_LEVEL=
# Configures the handling of creating mails with forged sender addresses.
#
# **0** => (not recommended) Mail address spoofing allowed. Any logged in user may create email messages with a forged sender address (see also https://en.wikipedia.org/wiki/Email_spoofing).
-# 1 => Mail spoofing denied. Each user may only send with his own or his alias addresses. Addresses with extension delimiters(http://www.postfix.org/postconf.5.html#recipient_delimiter) are not able to send messages.
+# 1 => Mail spoofing denied. Each user may only send with their own or their alias addresses. Addresses with extension delimiters(http://www.postfix.org/postconf.5.html#recipient_delimiter) are not able to send messages.
SPOOF_PROTECTION=
-# Enables the Sender Rewriting Scheme. SRS is needed if your mail server acts as forwarder. See [postsrsd](https://github.com/roehling/postsrsd/blob/master/README.md#sender-rewriting-scheme-crash-course) for further explanation.
+# Enables the Sender Rewriting Scheme. SRS is needed if your mail server acts as forwarder. See [postsrsd](https://github.com/roehling/postsrsd/blob/main/README.rst) for further explanation.
# - **0** => Disabled
# - 1 => Enabled
ENABLE_SRS=0
@@ -154,7 +154,7 @@ ENABLE_RSPAMD_REDIS=
#
# **0** => disabled
# 1 => enabled
-RSPAMD_LEARN=0
+RSPAMD_LEARN=1
# This settings controls whether checks should be performed on emails coming
# from authenticated users (i.e. most likely outgoing emails). The default value
@@ -171,7 +171,7 @@ RSPAMD_CHECK_AUTHENTICATED=0
#
# **0** => disabled
# 1 => enabled
-RSPAMD_GREYLISTING=1
+RSPAMD_GREYLISTING=0
# Can be used to enable or disable the Hfilter group module.
#
@@ -508,7 +508,7 @@ DOVECOT_MAILBOX_FORMAT=maildir
# empty => no
# yes => Allow bind authentication for LDAP
-# https://wiki.dovecot.org/AuthDatabase/LDAP/AuthBinds
+# https://doc.dovecot.org/2.4.0/core/config/auth/databases/ldap.html#authentication-bind
DOVECOT_AUTH_BIND=
# -----------------------------------------------
@@ -631,7 +631,7 @@ SRS_SECRET=
#
# Set a default host to relay all mail through (optionally include a port)
# Example: [mail.example.com]:587
-DEFAULT_RELAY_HOST=
+DEFAULT_RELAY_HOST=@@CRUPEST_MAIL_SERVER_RELAY@@
# -----------------------------------------------
# --- Multi-Domain Relay Section ----------------
@@ -646,7 +646,7 @@ RELAY_HOST=
# empty => 25
# default port to relay mail
-RELAY_PORT=25
+RELAY_PORT=@@CRUPEST_MAIL_SERVER_RELAY_PORT@@
# -----------------------------------------------
# --- Relay Host Credentials Section ------------
@@ -655,7 +655,7 @@ RELAY_PORT=25
# Configure a relay user and password to use with RELAY_HOST / DEFAULT_RELAY_HOST
# empty => no default
-RELAY_USER=
+RELAY_USER=@@CRUPEST_MAIL_SERVER_RELAY_USER@@
# empty => no default
-RELAY_PASSWORD=
+RELAY_PASSWORD=@@CRUPEST_MAIL_SERVER_RELAY_PASSWORD@@