diff --git a/examples/meet/tests/startup-test/test.sh b/examples/meet/tests/startup-test/test.sh index d1fd2b0..f5c74ae 100755 --- a/examples/meet/tests/startup-test/test.sh +++ b/examples/meet/tests/startup-test/test.sh @@ -3,7 +3,7 @@ set -ex # waits for key events in various containers -# e.g. kopano_server:236 signals succesful start of kopano-server process +# e.g. kopano_server:236 signals successful start of kopano-server process dockerize \ -wait file:///var/run/kopano/grapi/notify.sock \ -wait http://kopano_konnect:8777/.well-known/openid-configuration \ diff --git a/examples/traefik-proxy-subdomain.md b/examples/traefik-proxy-subdomain.md index 69ffe16..b4a6a63 100644 --- a/examples/traefik-proxy-subdomain.md +++ b/examples/traefik-proxy-subdomain.md @@ -1,11 +1,11 @@ -Situation and motivation: ---- -* running the kopano stack behind an ssl-terminating proxy -* as less as possible mantainence affort --> run the kopano stack as close as possible at the default configuration -* using the kopano-stack to provide a central ldap authentication for the domain, but running the frontents using a subdomain +# Situation and motivation: + +* running the kopano stack behind an ssl-terminating proxy +* as less as possible maintenance effort --> run the kopano stack as close as possible at the default configuration +* using the kopano-stack to provide a central ldap authentication for the domain, but running the frontend using a subdomain + +## Way to go: -Way to go: --- 1. initial clean **setup of kopano stack** --> follow the documentation of https://github.com/zokradonh/kopano-docker/blob/master/README.md 1. clone the repo https://github.com/zokradonh/kopano-docker 2. run the setup.sh (only steps, necessary for the configuration is shown here) @@ -15,26 +15,30 @@ Way to go: 4. Name of the BASE DN for LDAP `dc=mydomain,dc=com` 5. E-Mail Address displayed for the 'postmaster' `postmaster@mydomain.com` -2. ensure ldap and reverse-proxy domain is splitted correctly in generated `.env` file: -``` +2. ensure ldap and reverse-proxy domain is split correctly in generated `.env` file: + +```bash LDAP_DOMAIN=mydomain.com LDAP_BASE_DN=dc=mydomain,dc=com FQDN=kopano.mydomain.com ``` -3. ensure kwmserver is able to connect through an enpoint with valid ssl-certificate -``` +3. ensure kwmserver is able to connect through an endpoint with valid ssl-certificate + +```bash FQDNCLEANED=somethingInvalidToEnforceConnectionFromOutsideEndpoint ``` 4. ensure your traefik instance outside of the kopano-stack does allow **proxying to self-signed certificates**: -``` + +```bash command: --insecureSkipVerify=true ``` 5. disable the docker-host portmapping of the kopano-caddy proxy in `docker-compose.yml` to not interference with your traefik proxy -``` + +```yaml services: web: ... @@ -44,8 +48,9 @@ services: # - "${HTTPS:-443}:443" ``` -6. make the self-signed kopano reverse-proxy available in traeffik via `docker-compose.override.yml` -``` +6. make the self-signed kopano reverse-proxy available in traefik via `docker-compose.override.yml` + +```yaml version: "3.5" services: @@ -70,4 +75,4 @@ networks: name: ldap-net ``` -Everything else should be configurable as normal. My test-setup showed a functional active-sync connection using the mdm plugin in the webapp, as well as screensharing via kopano-meet. +Everything else should be configurable as normal. My test-setup showed a functional active-sync connection using the mdm plugin in the webapp, as well as screensharing via kopano-meet. diff --git a/ldap/bootstrap/schema/mmc/kopano.schema b/ldap/bootstrap/schema/mmc/kopano.schema index e9960a5..f4f772c 100644 --- a/ldap/bootstrap/schema/mmc/kopano.schema +++ b/ldap/bootstrap/schema/mmc/kopano.schema @@ -223,7 +223,7 @@ attributetype ( 1.3.6.1.4.1.47732.1.3.2.6 attributetype (1.3.6.1.4.1.47732.1.3.1.5 NAME 'kopanoQuotaUserWarningRecipients' - DESC 'KOPANO: Users who will recieve a notification email when a user exceeds his quota' + DESC 'KOPANO: Users who will receive a notification email when a user exceeds his quota' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 @@ -231,7 +231,7 @@ attributetype (1.3.6.1.4.1.47732.1.3.1.5 attributetype (1.3.6.1.4.1.47732.1.3.1.6 NAME 'kopanoQuotaCompanyWarningRecipients' - DESC 'KOPANO: Users who will recieve a notification email when a company exceeds its quota' + DESC 'KOPANO: Users who will receive a notification email when a company exceeds its quota' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 diff --git a/ldap_demo/Dockerfile b/ldap_demo/Dockerfile index 991ab8a..faa89dd 100644 --- a/ldap_demo/Dockerfile +++ b/ldap_demo/Dockerfile @@ -1,6 +1,6 @@ ARG docker_repo=zokradonh FROM ${docker_repo}/kopano_ldap -LABEL org.label-schema.description="Container for running OpenLDAP, which already has the Kopano schema included as well as users to easily demo the enviroment." +LABEL org.label-schema.description="Container for running OpenLDAP, which already has the Kopano schema included as well as users to easily demo the environment." COPY bootstrap /container/service/slapd/assets/config/bootstrap diff --git a/tests/startup-test/test.sh b/tests/startup-test/test.sh index 0e8c8a0..8788997 100755 --- a/tests/startup-test/test.sh +++ b/tests/startup-test/test.sh @@ -3,7 +3,7 @@ set -ex # waits for key events in various containers -# e.g. kopano_server:236 signals succesful start of kopano-server process +# e.g. kopano_server:236 signals successful start of kopano-server process dockerize \ -wait file://var/run/kopano/grapi/notify.sock \ -wait file://var/run/kopano/server.sock \