diff --git a/.env b/.env index 56a12cd..765799d 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ # database credentials MYSQL_ROOT_PASSWORD=modT9&?. -MYSQL_KOPANO_PASSWORD=Asdf2345 +MYSQL_KOPANO_PASSWORD=zAKt(85& diff --git a/core/Dockerfile b/core/Dockerfile index d7bffaa..2ff7cb9 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -19,10 +19,7 @@ EOF # use envsubst in entrypoint script to convert config templates to actual config files COPY --chmod=0775 entrypoint.sh /entrypoint.sh # https://documentation.kopano.io/kopanocore_administrator_manual/configure_kc_components.html#configure-kopano-dagent-for-delivery-via-unix-socket -EXPOSE 110 -EXPOSE 143 EXPOSE 236 -EXPOSE 8443 VOLUME /etc/kopano VOLUME /var/lib/kopano/attachments ENTRYPOINT ["/entrypoint.sh"] diff --git a/core/build.sh b/core/build.sh index 10ec897..6681afb 100644 --- a/core/build.sh +++ b/core/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/bash # export DOCKER_BUILDKIT=1 -docker run -d --rm --name www -p80:80 -v/root/kopano-docker/dist:/usr/local/apache2/htdocs httpd +docker run -d --rm --name dist -p80:80 -v/root/kopano-docker/dist:/usr/local/apache2/htdocs httpd docker build --no-cache --progress=plain -t core . docker build -t core . docker run --rm -it --name core -p8081:80 core bash diff --git a/core/entrypoint.sh b/core/entrypoint.sh index 22d83e5..007fc05 100644 --- a/core/entrypoint.sh +++ b/core/entrypoint.sh @@ -1,10 +1,5 @@ #!/usr/bin/env bash set -e -sed -i \ - -e's/#mysql_host = localhost/mysql_host = mysql/' \ - -e's/#mysql_user = root/mysql_user = kopano/' \ - -e's/#mysql_password =/mysql_password = Asdf2345/' \ - /etc/kopano/server.cfg # runas user kopano chown kopano:kopano /var/lib/kopano/attachments exec "$@" diff --git a/docker-compose.yml b/docker-compose.yml index b620bfc..526e174 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,12 @@ services: server: + build: ./core image: core depends_on: - mysql volumes: - attachments:/var/lib/kopano/attachments - - ./core/entrypoint.sh:/entrypoint.sh + - ./etc-zntrl/kopano:/etc/kopano:ro command: /usr/sbin/kopano-server mysql: image: mysql:5.7 @@ -48,7 +49,7 @@ volumes: # image: webapp # labels: # - traefik.enable=true - # - traefik.http.routers.webapp.rule=Host(`$MAIL_DOMAIN`) && Path(`/webapp`) + # - traefik.http.routers.webapp.rule=Host(`$MAIL_DOMAIN`) && PathPrefix(`/webapp`) # - traefik.http.routers.webapp.tls=true # - traefik.http.routers.webapp.tls.certResolver=default # depends_on: @@ -60,7 +61,7 @@ volumes: # image: z-push # labels: # - traefik.enable=true - # - traefik.http.routers.webapp.rule=Host(`$MAIL_DOMAIN`) && Path(`/Active-Sync-...`) + # - traefik.http.routers.webapp.rule=Host(`$MAIL_DOMAIN`) && PathPrefix(`/Active-Sync-...`) # - traefik.http.routers.webapp.tls=true # - traefik.http.routers.webapp.tls.certResolver=default # volumes: diff --git a/etc-zntrl/kopano/server.cfg b/etc-zntrl/kopano/server.cfg index 5d0cd7c..5225481 100644 --- a/etc-zntrl/kopano/server.cfg +++ b/etc-zntrl/kopano/server.cfg @@ -24,7 +24,7 @@ server_name = mail.zntrl.de #enable_distributed_kopano = false database_engine = mysql -mysql_host = localhost +mysql_host = mysql mysql_port = 3306 mysql_user = kopano mysql_password = zAKt(85& @@ -36,8 +36,8 @@ mysql_database = kopano # Space-separated list of users that are considered Kopano admins. local_admin_users = root kopano -log_method = file -log_file = /var/log/kopano/server.log +# log_method = file +# log_file = /var/log/kopano/server.log # Loglevel (0(none), 1(crit), 2(err), 3(warn), 4(notice), 5(info), 6(debug)) log_level = 5 log_timestamp = yes diff --git a/migration.sh b/migration.sh index 7b81ad4..9984848 100644 --- a/migration.sh +++ b/migration.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash -docker exec -it kopano-mysql-1 sh <