public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
Added Colors, cause there fancy :) + Added in generate_config.sh
e67ba608
generate_config.sh | 21 ++++++++++++++++++---
update.sh | 7 ++++---
2 files changed, 22 insertions(+), 6 deletions(-)Diff
diff --git a/generate_config.sh b/generate_config.sh
index d09dae9e..5c00347d 100755
--- a/generate_config.sh
+++ b/generate_config.sh
@@ -109,9 +109,24 @@ echo "Press enter to confirm the detected value '[value]' where applicable or en
while [ -z "${MAILCOW_HOSTNAME}" ]; do
read -p "Mail server hostname (FQDN) - this is not your mail domain, but your mail servers hostname: " -e MAILCOW_HOSTNAME
DOTS=${MAILCOW_HOSTNAME//[^.]};
- if [ ${#DOTS} -lt 2 ] && [ ! -z ${MAILCOW_HOSTNAME} ]; then
- echo "${MAILCOW_HOSTNAME} is not a FQDN"
- MAILCOW_HOSTNAME=
+ if [ ${#DOTS} -lt 1 ]; then
+ echo -e "\e[31mMAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) is not a FQDN!\e[0m"
+ sleep 1
+ echo "Please change it to a FQDN and redeploy the stack with docker(-)compose up -d"
+ exit 1
+ elif [[ "${MAILCOW_HOSTNAME: -1}" == "." ]]; then
+ echo "MAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) is ending with a dot. This is not a valid FQDN!"
+ exit 1
+ elif [ ${#DOTS} -eq 1 ]; then
+ echo -e "\e[33mMAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) does not contain a Subdomain. This is not fully tested and may cause issues.\e[0m"
+ echo "Find more information about why this message exists here: https://github.com/mailcow/mailcow-dockerized/issues/1572"
+ read -r -p "Do you want to proceed anyway? [y/N] " response
+ if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
+ echo "OK. Procceding."
+ else
+ echo "OK. Exiting."
+ exit 1
+ fi
fi
done
diff --git a/update.sh b/update.sh
index db0db3b4..5204659e 100755
--- a/update.sh
+++ b/update.sh
@@ -419,14 +419,15 @@ detect_docker_compose_command
[[ ! -f mailcow.conf ]] && { echo "mailcow.conf is missing! Is mailcow installed?"; exit 1;}
DOTS=${MAILCOW_HOSTNAME//[^.]};
if [ ${#DOTS} -lt 1 ]; then
- echo "MAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) is not a FQDN!"
- echo "Please change it to a FQDN and run $COMPOSE_COMMAND down followed by $COMPOSE_COMMAND up -d"
+ echo -e "\e[31mMAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) is not a FQDN!\e[0m"
+ sleep 1
+ echo "Please change it to a FQDN and redeploy the stack with $COMPOSE_COMMAND up -d"
exit 1
elif [[ "${MAILCOW_HOSTNAME: -1}" == "." ]]; then
echo "MAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) is ending with a dot. This is not a valid FQDN!"
exit 1
elif [ ${#DOTS} -eq 1 ]; then
- echo "MAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) does not contain a Subdomain. This is not fully tested and may cause issues."
+ echo -e "\e[33mMAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) does not contain a Subdomain. This is not fully tested and may cause issues.\e[0m"
echo "Find more information about why this message exists here: https://github.com/mailcow/mailcow-dockerized/issues/1572"
read -r -p "Do you want to proceed anyway? [y/N] " response
if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then