flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-31 10:27:14 +00:00
Code Issues Releases Wiki Activity

fix yes set as timezone (#157)

Browse Source 
* fix yes set as timezone

value_default would not be empty but rather have yes as the value

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* also add version control for ssl and kweb

Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels 2019-05-14 15:17:32 +02:00 committed by GitHub
parent 3a886cfbeb
commit 38d9993b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -2,7 +2,7 @@ version: "3.5"
services: services:
web: web:
image: ${docker_repo:-zokradonh}/kopano_web image: ${docker_repo:-zokradonh}/kopano_web:${KWEB_VERSION:-latest}
restart: unless-stopped restart: unless-stopped
ports: ports:
- "${CADDY:-2015}:2015" - "${CADDY:-2015}:2015"
@ -178,7 +178,7 @@ services:
- kopano-net - kopano-net
kopano_ssl: kopano_ssl:
image: ${docker_repo:-zokradonh}/kopano_ssl image: ${docker_repo:-zokradonh}/kopano_ssl:${SSL_VERSION:-latest}
environment: environment:
- FQDN=${FQDN} - FQDN=${FQDN}
- PKI_COUNTRY=NL - PKI_COUNTRY=NL

6
setup.sh
View File

@ -184,10 +184,8 @@ if [ ! -e ./.env ]; then
value_default=$(cat /etc/timezone) value_default=$(cat /etc/timezone)
elif [ -f /etc/localtime ]; then elif [ -f /etc/localtime ]; then
value_default=$(readlink /etc/localtime|sed -n 's|^.*zoneinfo/||p') value_default=$(readlink /etc/localtime|sed -n 's|^.*zoneinfo/||p')
fi else
value_default="Europe/Berlin"
if [ -z "${value_default}" ]; then
value_default="Europe/Berlin".
fi fi
read -r -p "Timezone to be used [$value_default]: " new_value read -r -p "Timezone to be used [$value_default]: " new_value