flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-06 23:46:24 +00:00
Code Issues Releases Wiki Activity

fallback to a hardcoded value in case FQDNCLEANED is not set (#443)

Browse Source 
* fallback to a hardcoded value in case FQDNCLEANED is not set
* strip ports in kweb startup script
This commit is contained in:
Felix Bartels 2020-09-15 11:29:41 +02:00 committed by GitHub
parent 9a7bca01c7
commit 045ca52d79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -8,7 +8,7 @@ services:
environment: environment:
- DEFAULTREDIRECT=${DEFAULTREDIRECT:-/webapp} - DEFAULTREDIRECT=${DEFAULTREDIRECT:-/webapp}
- EMAIL=${EMAIL:-off} - EMAIL=${EMAIL:-off}
- FQDN=${FQDNCLEANED?err} - FQDN=${FQDN}
- TLS_MODE=tls_auto - TLS_MODE=tls_auto
volumes: volumes:
- /etc/machine-id:/etc/machine-id - /etc/machine-id:/etc/machine-id
@ -17,7 +17,7 @@ services:
networks: networks:
web-net: web-net:
aliases: aliases:
- ${FQDNCLEANED?err} - ${FQDNCLEANED:-domain.invalid}
kopano_ssl: kopano_ssl:
image: ${docker_repo:-zokradonh}/kopano_ssl:${SSL_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_ssl:${SSL_VERSION:-latest}

2
examples/apache-proxy.md
View File

@ -2,7 +2,7 @@
Example provided by [ronnybremer](https://github.com/ronnybremer) in [Add reverse proxy example for Apache](https://github.com/zokradonh/kopano-docker/issues/372). Example provided by [ronnybremer](https://github.com/ronnybremer) in [Add reverse proxy example for Apache](https://github.com/zokradonh/kopano-docker/issues/372).
To be able to use a different proxy, than the bundled kweb the env variable `FQDNCLEANED` needs to be set to an invalid value (to not route traffic through it, but the external proxy). Additionally `EMAIL` needs to be set to `off`. To be able to use a different proxy, than the bundled kweb the env variable `FQDNCLEANED` needs to be unset (to not route traffic through it, but the external proxy). Additionally `EMAIL` needs to be set to `off`.
```bash ```bash
<VirtualHost aaa.bbb.ccc.ddd:443 [aaaa:bbbb:cccc:dddd:eeee:ffff::yy]:443> <VirtualHost aaa.bbb.ccc.ddd:443 [aaaa:bbbb:cccc:dddd:eeee:ffff::yy]:443>

4
examples/meet/docker-compose.yml
View File

@ -11,7 +11,7 @@ services:
environment: environment:
- DEFAULTREDIRECT=/meet - DEFAULTREDIRECT=/meet
- EMAIL=${EMAIL:-off} - EMAIL=${EMAIL:-off}
- FQDN=${FQDNCLEANED?err} - FQDN=${FQDN}
command: wrapper.sh command: wrapper.sh
volumes: volumes:
- /etc/machine-id:/etc/machine-id - /etc/machine-id:/etc/machine-id
@ -20,7 +20,7 @@ services:
networks: networks:
web-net: web-net:
aliases: aliases:
- ${FQDNCLEANED?err} - ${FQDNCLEANED:-domain.invalid}
ldap: ldap:
image: ${docker_repo:-kopano}/${LDAP_CONTAINER:-kopano_ldap_demo}:${LDAP_VERSION:-latest} image: ${docker_repo:-kopano}/${LDAP_CONTAINER:-kopano_ldap_demo}:${LDAP_VERSION:-latest}

2
web/README.md
View File

@ -42,7 +42,7 @@ TLS_MODE=tls_off
In case there is already an ssl terminating proxy in the network this container can be switched to plain http by either setting `EMAIL=off` or `TLS_MODE=tls_off`. In case there is already an ssl terminating proxy in the network this container can be switched to plain http by either setting `EMAIL=off` or `TLS_MODE=tls_off`.
In addition to this the default docker-compose.yml has a tweak to [route all traffic for the configured domain through this container](https://github.com/zokradonh/kopano-docker/blob/3572fc74e7054c9774985e69aeed745f9e5d1a4f/docker-compose.yml#L19-L20). This route needs to be changed when this container is only offering http access by either putting another domain in `FQDNCLEANED` or removing this section altogether. In addition to this the default docker-compose.yml has a tweak to [route all traffic for the configured domain through this container](https://github.com/zokradonh/kopano-docker/blob/3572fc74e7054c9774985e69aeed745f9e5d1a4f/docker-compose.yml#L19-L20). This route needs to be changed when this container is only offering http access by removing `FQDNCLEANED` from `.env`.
When using an external reverse proxy it is recommended to proxy connections to port 2015 of this container. Additionally connections to `/api/kwm/v2/rtm/websocket` need to be upgraded to websocket connections. When using an external reverse proxy it is recommended to proxy connections to port 2015 of this container. Additionally connections to `/api/kwm/v2/rtm/websocket` need to be upgraded to websocket connections.

3
web/wrapper.sh
View File

@ -10,6 +10,9 @@ fi
export CADDYPATH="$KOPANO_KWEB_ASSETS_PATH" export CADDYPATH="$KOPANO_KWEB_ASSETS_PATH"
# remove ports from FQDN
export FQDN=${FQDN%:*}
# services need to be aware of the machine-id # services need to be aware of the machine-id
if [ "$AUTOCONFIGURE" = true ]; then if [ "$AUTOCONFIGURE" = true ]; then
dockerize \ dockerize \