From 9cd74b69edd7335cbd3387a078425ed9455c9a9c Mon Sep 17 00:00:00 2001 From: Andreas Balogh Date: Sat, 16 Jul 2022 20:31:42 +0000 Subject: [PATCH] added multi-domain and s6 --- build.sh => etc-baloghs/build.sh | 0 .../docker-compose.yml | 0 {etc => etc-baloghs}/kopano/admin.cfg | 0 {etc => etc-baloghs}/kopano/autorespond.cfg | 0 {etc => etc-baloghs}/kopano/backup.cfg | 0 {etc => etc-baloghs}/kopano/dagent.cfg | 0 {etc => etc-baloghs}/kopano/gateway.cfg | 0 {etc => etc-baloghs}/kopano/grapi.cfg | 0 {etc => etc-baloghs}/kopano/ical.cfg | 0 .../kopano/kapid-pubs-secret.key | 0 {etc => etc-baloghs}/kopano/kapid.cfg | 0 .../kopano/konnectd-encryption-secret.key | 0 .../kopano/konnectd-identifier-scopes.yaml | 0 .../kopano/konnectd-signing-private-key.pem | 0 {etc => etc-baloghs}/kopano/konnectd.cfg | 0 .../konnectkeys/konnect-20210314-0ae1.pem | 0 .../kopano/kweb/.kweb/.setup-done | 0 {etc => etc-baloghs}/kopano/kwebd.cfg | 0 {etc => etc-baloghs}/kopano/ldap.cfg | 0 {etc => etc-baloghs}/kopano/monitor.cfg | 0 {etc => etc-baloghs}/kopano/php-mapi.cfg | 0 .../kopano/quotamail/companywarning.mail | 0 .../kopano/quotamail/userhard.mail | 0 .../kopano/quotamail/usersoft.mail | 0 .../kopano/quotamail/userwarning.mail | 0 {etc => etc-baloghs}/kopano/search.cfg | 0 {etc => etc-baloghs}/kopano/server.cfg | 0 {etc => etc-baloghs}/kopano/spamd.cfg | 0 {etc => etc-baloghs}/kopano/spooler.cfg | 0 {etc => etc-baloghs}/kopano/statsd.cfg | 0 {etc => etc-baloghs}/kopano/unix.cfg | 0 {etc => etc-baloghs}/kopano/webapp/.htaccess | 0 .../kopano/webapp/config-contactfax.php | 0 .../kopano/webapp/config-gmaps.php | 0 .../kopano/webapp/config-intranet.php | 0 .../kopano/webapp/config-mattermost.php | 0 .../kopano/webapp/config-meet.php | 0 .../kopano/webapp/config-pimfolder.php | 0 .../kopano/webapp/config-threema4deskapp.php | 0 .../kopano/webapp/config-whatsapp4deskapp.php | 0 {etc => etc-baloghs}/kopano/webapp/config.php | 0 {etc => etc-baloghs}/postfix/dynamicmaps.cf | 0 {etc => etc-baloghs}/postfix/main.cf | 0 {etc => etc-baloghs}/postfix/main.cf.proto | 0 {etc => etc-baloghs}/postfix/master.cf | 0 {etc => etc-baloghs}/postfix/master.cf.proto | 0 {etc => etc-baloghs}/postfix/post-install | 0 {etc => etc-baloghs}/postfix/postfix-files | 0 {etc => etc-baloghs}/postfix/postfix-script | 0 {etc => etc-baloghs}/postfix/virtual | 0 {etc => etc-baloghs}/postfix/virtual.db | Bin {etc => etc-baloghs}/postfix/vmailbox | 0 {etc => etc-baloghs}/postfix/vmailbox.db | Bin etc-zntrl/docker-compose.yml | 0 kopano.dockerfile | 22 +++++++++++------- run.sh | 4 ---- service/server/run | 3 --- 57 files changed, 13 insertions(+), 16 deletions(-) rename build.sh => etc-baloghs/build.sh (100%) rename etc/kopano/kweb/.kweb/.setup-done => etc-baloghs/docker-compose.yml (100%) rename {etc => etc-baloghs}/kopano/admin.cfg (100%) rename {etc => etc-baloghs}/kopano/autorespond.cfg (100%) rename {etc => etc-baloghs}/kopano/backup.cfg (100%) rename {etc => etc-baloghs}/kopano/dagent.cfg (100%) rename {etc => etc-baloghs}/kopano/gateway.cfg (100%) rename {etc => etc-baloghs}/kopano/grapi.cfg (100%) rename {etc => etc-baloghs}/kopano/ical.cfg (100%) rename {etc => etc-baloghs}/kopano/kapid-pubs-secret.key (100%) rename {etc => etc-baloghs}/kopano/kapid.cfg (100%) rename {etc => etc-baloghs}/kopano/konnectd-encryption-secret.key (100%) rename {etc => etc-baloghs}/kopano/konnectd-identifier-scopes.yaml (100%) rename {etc => etc-baloghs}/kopano/konnectd-signing-private-key.pem (100%) rename {etc => etc-baloghs}/kopano/konnectd.cfg (100%) rename {etc => etc-baloghs}/kopano/konnectkeys/konnect-20210314-0ae1.pem (100%) rename service/server/down => etc-baloghs/kopano/kweb/.kweb/.setup-done (100%) rename {etc => etc-baloghs}/kopano/kwebd.cfg (100%) rename {etc => etc-baloghs}/kopano/ldap.cfg (100%) rename {etc => etc-baloghs}/kopano/monitor.cfg (100%) rename {etc => etc-baloghs}/kopano/php-mapi.cfg (100%) rename {etc => etc-baloghs}/kopano/quotamail/companywarning.mail (100%) rename {etc => etc-baloghs}/kopano/quotamail/userhard.mail (100%) rename {etc => etc-baloghs}/kopano/quotamail/usersoft.mail (100%) rename {etc => etc-baloghs}/kopano/quotamail/userwarning.mail (100%) rename {etc => etc-baloghs}/kopano/search.cfg (100%) rename {etc => etc-baloghs}/kopano/server.cfg (100%) rename {etc => etc-baloghs}/kopano/spamd.cfg (100%) rename {etc => etc-baloghs}/kopano/spooler.cfg (100%) rename {etc => etc-baloghs}/kopano/statsd.cfg (100%) rename {etc => etc-baloghs}/kopano/unix.cfg (100%) rename {etc => etc-baloghs}/kopano/webapp/.htaccess (100%) rename {etc => etc-baloghs}/kopano/webapp/config-contactfax.php (100%) rename {etc => etc-baloghs}/kopano/webapp/config-gmaps.php (100%) rename {etc => etc-baloghs}/kopano/webapp/config-intranet.php (100%) rename {etc => etc-baloghs}/kopano/webapp/config-mattermost.php (100%) rename {etc => etc-baloghs}/kopano/webapp/config-meet.php (100%) rename {etc => etc-baloghs}/kopano/webapp/config-pimfolder.php (100%) rename {etc => etc-baloghs}/kopano/webapp/config-threema4deskapp.php (100%) rename {etc => etc-baloghs}/kopano/webapp/config-whatsapp4deskapp.php (100%) rename {etc => etc-baloghs}/kopano/webapp/config.php (100%) rename {etc => etc-baloghs}/postfix/dynamicmaps.cf (100%) rename {etc => etc-baloghs}/postfix/main.cf (100%) rename {etc => etc-baloghs}/postfix/main.cf.proto (100%) rename {etc => etc-baloghs}/postfix/master.cf (100%) rename {etc => etc-baloghs}/postfix/master.cf.proto (100%) rename {etc => etc-baloghs}/postfix/post-install (100%) rename {etc => etc-baloghs}/postfix/postfix-files (100%) rename {etc => etc-baloghs}/postfix/postfix-script (100%) rename {etc => etc-baloghs}/postfix/virtual (100%) rename {etc => etc-baloghs}/postfix/virtual.db (100%) rename {etc => etc-baloghs}/postfix/vmailbox (100%) rename {etc => etc-baloghs}/postfix/vmailbox.db (100%) create mode 100644 etc-zntrl/docker-compose.yml delete mode 100644 run.sh delete mode 100644 service/server/run diff --git a/build.sh b/etc-baloghs/build.sh similarity index 100% rename from build.sh rename to etc-baloghs/build.sh diff --git a/etc/kopano/kweb/.kweb/.setup-done b/etc-baloghs/docker-compose.yml similarity index 100% rename from etc/kopano/kweb/.kweb/.setup-done rename to etc-baloghs/docker-compose.yml diff --git a/etc/kopano/admin.cfg b/etc-baloghs/kopano/admin.cfg similarity index 100% rename from etc/kopano/admin.cfg rename to etc-baloghs/kopano/admin.cfg diff --git a/etc/kopano/autorespond.cfg b/etc-baloghs/kopano/autorespond.cfg similarity index 100% rename from etc/kopano/autorespond.cfg rename to etc-baloghs/kopano/autorespond.cfg diff --git a/etc/kopano/backup.cfg b/etc-baloghs/kopano/backup.cfg similarity index 100% rename from etc/kopano/backup.cfg rename to etc-baloghs/kopano/backup.cfg diff --git a/etc/kopano/dagent.cfg b/etc-baloghs/kopano/dagent.cfg similarity index 100% rename from etc/kopano/dagent.cfg rename to etc-baloghs/kopano/dagent.cfg diff --git a/etc/kopano/gateway.cfg b/etc-baloghs/kopano/gateway.cfg similarity index 100% rename from etc/kopano/gateway.cfg rename to etc-baloghs/kopano/gateway.cfg diff --git a/etc/kopano/grapi.cfg b/etc-baloghs/kopano/grapi.cfg similarity index 100% rename from etc/kopano/grapi.cfg rename to etc-baloghs/kopano/grapi.cfg diff --git a/etc/kopano/ical.cfg b/etc-baloghs/kopano/ical.cfg similarity index 100% rename from etc/kopano/ical.cfg rename to etc-baloghs/kopano/ical.cfg diff --git a/etc/kopano/kapid-pubs-secret.key b/etc-baloghs/kopano/kapid-pubs-secret.key similarity index 100% rename from etc/kopano/kapid-pubs-secret.key rename to etc-baloghs/kopano/kapid-pubs-secret.key diff --git a/etc/kopano/kapid.cfg b/etc-baloghs/kopano/kapid.cfg similarity index 100% rename from etc/kopano/kapid.cfg rename to etc-baloghs/kopano/kapid.cfg diff --git a/etc/kopano/konnectd-encryption-secret.key b/etc-baloghs/kopano/konnectd-encryption-secret.key similarity index 100% rename from etc/kopano/konnectd-encryption-secret.key rename to etc-baloghs/kopano/konnectd-encryption-secret.key diff --git a/etc/kopano/konnectd-identifier-scopes.yaml b/etc-baloghs/kopano/konnectd-identifier-scopes.yaml similarity index 100% rename from etc/kopano/konnectd-identifier-scopes.yaml rename to etc-baloghs/kopano/konnectd-identifier-scopes.yaml diff --git a/etc/kopano/konnectd-signing-private-key.pem b/etc-baloghs/kopano/konnectd-signing-private-key.pem similarity index 100% rename from etc/kopano/konnectd-signing-private-key.pem rename to etc-baloghs/kopano/konnectd-signing-private-key.pem diff --git a/etc/kopano/konnectd.cfg b/etc-baloghs/kopano/konnectd.cfg similarity index 100% rename from etc/kopano/konnectd.cfg rename to etc-baloghs/kopano/konnectd.cfg diff --git a/etc/kopano/konnectkeys/konnect-20210314-0ae1.pem b/etc-baloghs/kopano/konnectkeys/konnect-20210314-0ae1.pem similarity index 100% rename from etc/kopano/konnectkeys/konnect-20210314-0ae1.pem rename to etc-baloghs/kopano/konnectkeys/konnect-20210314-0ae1.pem diff --git a/service/server/down b/etc-baloghs/kopano/kweb/.kweb/.setup-done similarity index 100% rename from service/server/down rename to etc-baloghs/kopano/kweb/.kweb/.setup-done diff --git a/etc/kopano/kwebd.cfg b/etc-baloghs/kopano/kwebd.cfg similarity index 100% rename from etc/kopano/kwebd.cfg rename to etc-baloghs/kopano/kwebd.cfg diff --git a/etc/kopano/ldap.cfg b/etc-baloghs/kopano/ldap.cfg similarity index 100% rename from etc/kopano/ldap.cfg rename to etc-baloghs/kopano/ldap.cfg diff --git a/etc/kopano/monitor.cfg b/etc-baloghs/kopano/monitor.cfg similarity index 100% rename from etc/kopano/monitor.cfg rename to etc-baloghs/kopano/monitor.cfg diff --git a/etc/kopano/php-mapi.cfg b/etc-baloghs/kopano/php-mapi.cfg similarity index 100% rename from etc/kopano/php-mapi.cfg rename to etc-baloghs/kopano/php-mapi.cfg diff --git a/etc/kopano/quotamail/companywarning.mail b/etc-baloghs/kopano/quotamail/companywarning.mail similarity index 100% rename from etc/kopano/quotamail/companywarning.mail rename to etc-baloghs/kopano/quotamail/companywarning.mail diff --git a/etc/kopano/quotamail/userhard.mail b/etc-baloghs/kopano/quotamail/userhard.mail similarity index 100% rename from etc/kopano/quotamail/userhard.mail rename to etc-baloghs/kopano/quotamail/userhard.mail diff --git a/etc/kopano/quotamail/usersoft.mail b/etc-baloghs/kopano/quotamail/usersoft.mail similarity index 100% rename from etc/kopano/quotamail/usersoft.mail rename to etc-baloghs/kopano/quotamail/usersoft.mail diff --git a/etc/kopano/quotamail/userwarning.mail b/etc-baloghs/kopano/quotamail/userwarning.mail similarity index 100% rename from etc/kopano/quotamail/userwarning.mail rename to etc-baloghs/kopano/quotamail/userwarning.mail diff --git a/etc/kopano/search.cfg b/etc-baloghs/kopano/search.cfg similarity index 100% rename from etc/kopano/search.cfg rename to etc-baloghs/kopano/search.cfg diff --git a/etc/kopano/server.cfg b/etc-baloghs/kopano/server.cfg similarity index 100% rename from etc/kopano/server.cfg rename to etc-baloghs/kopano/server.cfg diff --git a/etc/kopano/spamd.cfg b/etc-baloghs/kopano/spamd.cfg similarity index 100% rename from etc/kopano/spamd.cfg rename to etc-baloghs/kopano/spamd.cfg diff --git a/etc/kopano/spooler.cfg b/etc-baloghs/kopano/spooler.cfg similarity index 100% rename from etc/kopano/spooler.cfg rename to etc-baloghs/kopano/spooler.cfg diff --git a/etc/kopano/statsd.cfg b/etc-baloghs/kopano/statsd.cfg similarity index 100% rename from etc/kopano/statsd.cfg rename to etc-baloghs/kopano/statsd.cfg diff --git a/etc/kopano/unix.cfg b/etc-baloghs/kopano/unix.cfg similarity index 100% rename from etc/kopano/unix.cfg rename to etc-baloghs/kopano/unix.cfg diff --git a/etc/kopano/webapp/.htaccess b/etc-baloghs/kopano/webapp/.htaccess similarity index 100% rename from etc/kopano/webapp/.htaccess rename to etc-baloghs/kopano/webapp/.htaccess diff --git a/etc/kopano/webapp/config-contactfax.php b/etc-baloghs/kopano/webapp/config-contactfax.php similarity index 100% rename from etc/kopano/webapp/config-contactfax.php rename to etc-baloghs/kopano/webapp/config-contactfax.php diff --git a/etc/kopano/webapp/config-gmaps.php b/etc-baloghs/kopano/webapp/config-gmaps.php similarity index 100% rename from etc/kopano/webapp/config-gmaps.php rename to etc-baloghs/kopano/webapp/config-gmaps.php diff --git a/etc/kopano/webapp/config-intranet.php b/etc-baloghs/kopano/webapp/config-intranet.php similarity index 100% rename from etc/kopano/webapp/config-intranet.php rename to etc-baloghs/kopano/webapp/config-intranet.php diff --git a/etc/kopano/webapp/config-mattermost.php b/etc-baloghs/kopano/webapp/config-mattermost.php similarity index 100% rename from etc/kopano/webapp/config-mattermost.php rename to etc-baloghs/kopano/webapp/config-mattermost.php diff --git a/etc/kopano/webapp/config-meet.php b/etc-baloghs/kopano/webapp/config-meet.php similarity index 100% rename from etc/kopano/webapp/config-meet.php rename to etc-baloghs/kopano/webapp/config-meet.php diff --git a/etc/kopano/webapp/config-pimfolder.php b/etc-baloghs/kopano/webapp/config-pimfolder.php similarity index 100% rename from etc/kopano/webapp/config-pimfolder.php rename to etc-baloghs/kopano/webapp/config-pimfolder.php diff --git a/etc/kopano/webapp/config-threema4deskapp.php b/etc-baloghs/kopano/webapp/config-threema4deskapp.php similarity index 100% rename from etc/kopano/webapp/config-threema4deskapp.php rename to etc-baloghs/kopano/webapp/config-threema4deskapp.php diff --git a/etc/kopano/webapp/config-whatsapp4deskapp.php b/etc-baloghs/kopano/webapp/config-whatsapp4deskapp.php similarity index 100% rename from etc/kopano/webapp/config-whatsapp4deskapp.php rename to etc-baloghs/kopano/webapp/config-whatsapp4deskapp.php diff --git a/etc/kopano/webapp/config.php b/etc-baloghs/kopano/webapp/config.php similarity index 100% rename from etc/kopano/webapp/config.php rename to etc-baloghs/kopano/webapp/config.php diff --git a/etc/postfix/dynamicmaps.cf b/etc-baloghs/postfix/dynamicmaps.cf similarity index 100% rename from etc/postfix/dynamicmaps.cf rename to etc-baloghs/postfix/dynamicmaps.cf diff --git a/etc/postfix/main.cf b/etc-baloghs/postfix/main.cf similarity index 100% rename from etc/postfix/main.cf rename to etc-baloghs/postfix/main.cf diff --git a/etc/postfix/main.cf.proto b/etc-baloghs/postfix/main.cf.proto similarity index 100% rename from etc/postfix/main.cf.proto rename to etc-baloghs/postfix/main.cf.proto diff --git a/etc/postfix/master.cf b/etc-baloghs/postfix/master.cf similarity index 100% rename from etc/postfix/master.cf rename to etc-baloghs/postfix/master.cf diff --git a/etc/postfix/master.cf.proto b/etc-baloghs/postfix/master.cf.proto similarity index 100% rename from etc/postfix/master.cf.proto rename to etc-baloghs/postfix/master.cf.proto diff --git a/etc/postfix/post-install b/etc-baloghs/postfix/post-install similarity index 100% rename from etc/postfix/post-install rename to etc-baloghs/postfix/post-install diff --git a/etc/postfix/postfix-files b/etc-baloghs/postfix/postfix-files similarity index 100% rename from etc/postfix/postfix-files rename to etc-baloghs/postfix/postfix-files diff --git a/etc/postfix/postfix-script b/etc-baloghs/postfix/postfix-script similarity index 100% rename from etc/postfix/postfix-script rename to etc-baloghs/postfix/postfix-script diff --git a/etc/postfix/virtual b/etc-baloghs/postfix/virtual similarity index 100% rename from etc/postfix/virtual rename to etc-baloghs/postfix/virtual diff --git a/etc/postfix/virtual.db b/etc-baloghs/postfix/virtual.db similarity index 100% rename from etc/postfix/virtual.db rename to etc-baloghs/postfix/virtual.db diff --git a/etc/postfix/vmailbox b/etc-baloghs/postfix/vmailbox similarity index 100% rename from etc/postfix/vmailbox rename to etc-baloghs/postfix/vmailbox diff --git a/etc/postfix/vmailbox.db b/etc-baloghs/postfix/vmailbox.db similarity index 100% rename from etc/postfix/vmailbox.db rename to etc-baloghs/postfix/vmailbox.db diff --git a/etc-zntrl/docker-compose.yml b/etc-zntrl/docker-compose.yml new file mode 100644 index 0000000..e69de29 diff --git a/kopano.dockerfile b/kopano.dockerfile index 84454cb..7bcbd65 100644 --- a/kopano.dockerfile +++ b/kopano.dockerfile @@ -1,13 +1,11 @@ # FROM ubuntu:20.04 FROM tozd/runit:ubuntu-focal -# declaration section -ARG MAIL_DOMAIN=zntrl.de -EXPOSE 80 443 -EXPOSE 2003 -EXPOSE 993 -EXPOSE 8443 -# build section -# kopano +# build s6 process manager +# build postfix +# build postgres +# build apache +# build z-push +# build kopano WORKDIR /root COPY dist/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64.tar.gz . COPY dist/webapp-6.0.0.57.1049268-Ubuntu_20.04-all.tar.gz . @@ -15,6 +13,12 @@ COPY deploy-kopano.sh . RUN ./deploy-kopano.sh COPY service /etc/service # https://documentation.kopano.io/kopanocore_administrator_manual/configure_kc_components.html#configure-kopano-dagent-for-delivery-via-unix-socket +# declaration section +ARG MAIL_DOMAIN=zntrl.de +EXPOSE 80 443 +EXPOSE 2003 +EXPOSE 993 +EXPOSE 8443 # create run scripts in etc/service # CMD ["/usr/sbin/kopano-server", "-F", "-c", "/etc/kopano/server.cfg"] -ENTRYPOINT [""] \ No newline at end of file +ENTRYPOINT ["init.sh"] \ No newline at end of file diff --git a/run.sh b/run.sh deleted file mode 100644 index 8474f73..0000000 --- a/run.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/bash -docker run -d \ - -p 80:80 \ - kopano:1 \ No newline at end of file diff --git a/service/server/run b/service/server/run deleted file mode 100644 index 3c62f86..0000000 --- a/service/server/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -exec /usr/sbin/kopano-server -c /etc/kopano/server.cfg 2>&1 \ No newline at end of file