Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

2017-09-11 21:49:32 +02:00 · 2017-09-11 21:49:32 +02:00 · 907f02fd06
parent 2d0af3f486 9b4ef99084
commit 907f02fd06
1 changed files with 1 additions and 1 deletions
--- a/generate_config.sh
+++ b/generate_config.sh
@ -16,7 +16,7 @@ if [ -z "$MAILCOW_HOSTNAME" ]; then
  read -p "Hostname (FQDN): " -ei "mx.example.org" MAILCOW_HOSTNAME
 fi

-[[ -a /etc/timezone ]] && TZ=$(cat /etc/timezone)
+[[ -a /etc/timezone ]] && TZ=$(cat /etc/timezone) || [[ -a /etc/localtime ]] && TZ=$(readlink /etc/localtime|sed -n 's|^.*zoneinfo/||p')
 if [ -z "$TZ" ]; then
  read -p "Timezone: " -ei "Europe/Berlin" TZ
 else