git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "32243e56"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "e2b4b6f6"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I51e2016ef5ab88a8b0bdc08551b18f48ceef0aa5
diff --git a/mailcow/src/mailcow-dockerized/generate_config.sh b/mailcow/src/mailcow-dockerized/generate_config.sh
index 33823a7..67ff3ac 100755
--- a/mailcow/src/mailcow-dockerized/generate_config.sh
+++ b/mailcow/src/mailcow-dockerized/generate_config.sh
@@ -12,8 +12,8 @@
if grep -q Ubuntu <<< $(uname -a); then
echo "DO NOT RUN mailcow ON THIS UBUNTU KERNEL!";
echo "Please update to linux-generic-hwe-16.04 by running \"apt-get install --install-recommends linux-generic-hwe-16.04\""
+ exit 1
fi
- exit 1
fi
if grep --help 2>&1 | grep -q -i "busybox"; then
@@ -287,6 +287,9 @@
# Will only work with unmodified mailcow setups.
WATCHDOG_EXTERNAL_CHECKS=n
+# Enable watchdog verbose logging
+WATCHDOG_VERBOSE=n
+
# Max log lines per service to keep in Redis logs
LOG_LINES=9999
@@ -338,7 +341,7 @@
# Optional: Leave empty for none
# This value is only used on first order!
# Setting it at a later point will require the following steps:
-# https://mailcow.github.io/mailcow-dockerized-docs/debug-reset-tls/
+# https://mailcow.github.io/mailcow-dockerized-docs/debug-reset_tls/
ACME_CONTACT=
EOF