From 47a7aa78079f60e2af4635b5f7f147c57a0391ed Mon Sep 17 00:00:00 2001 From: andryyy Date: Tue, 21 Feb 2017 22:26:14 +0100 Subject: [PATCH] Not of any use as of today --- docker-compose.yml | 13 +++++++++++++ generate_config.sh | 3 +++ 2 files changed, 16 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 26c78fdf..3eaa2b47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -201,6 +201,19 @@ services: aliases: - memcached +# clamav-mailcow: +# build: ./data/Dockerfiles/clamav +# depends_on: +# - pdns-mailcow +# restart: always +# dns: +# - 172.22.1.250 +# dns_search: mailcow-network +# networks: +# mailcow-network: +# aliases: +# - clamav + nginx-mailcow: depends_on: - sogo-mailcow diff --git a/generate_config.sh b/generate_config.sh index 213bdcdb..3e08ae80 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -16,8 +16,11 @@ if [ -z "$MAILCOW_HOSTNAME" ]; then read -p "Hostname (FQDN): " -ei "mx.example.org" MAILCOW_HOSTNAME fi +[[ -a /etc/timezone ]] && TZ=$(cat /etc/timezone) if [ -z "$TZ" ]; then read -p "Timezone: " -ei "Europe/Berlin" TZ +else + read -p "Timezone: " -ei ${TZ} TZ fi cat << EOF > mailcow.conf