From 06296c147602b416533c33a43fdd1386fd4b064c Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Sun, 17 Jul 2022 17:01:03 +0200 Subject: [PATCH] Fixed CheckMK entry in mkdocs.yml + Restructuring third_party folders --- docs/post_installation/firststeps-ssl.de.md | 2 +- .../third_party-borgmatic.de.md | 0 .../third_party-borgmatic.en.md | 0 .../checkmk/u_e-checkmk.de.md | 0 .../checkmk/u_e-checkmk.en.md | 0 .../third_party-exchange_onprem.de.md | 2 +- .../third_party-exchange_onprem.en.md | 2 +- .../{ => gitea}/third_party-gitea.de.md | 0 .../{ => gitea}/third_party-gitea.en.md | 0 .../{ => gogs}/third_party-gogs.de.md | 0 .../{ => gogs}/third_party-gogs.en.md | 0 .../{ => mailman3}/third_party-mailman3.de.md | 8 ++-- .../{ => mailman3}/third_party-mailman3.en.md | 8 ++-- .../third_party-mailpiler_integration.de.md | 0 .../third_party-mailpiler_integration.en.md | 0 .../third_party-nextcloud.de.md | 2 +- .../third_party-nextcloud.en.md | 2 +- .../third_party-portainer.de.md | 0 .../third_party-portainer.en.md | 0 .../third_party-roundcube.de.md | 0 .../third_party-roundcube.en.md | 0 mkdocs.yml | 39 ++++++++++--------- 22 files changed, 33 insertions(+), 32 deletions(-) rename docs/third_party/{ => borgmatic}/third_party-borgmatic.de.md (100%) rename docs/third_party/{ => borgmatic}/third_party-borgmatic.en.md (100%) rename docs/{manual-guides => third_party}/checkmk/u_e-checkmk.de.md (100%) rename docs/{manual-guides => third_party}/checkmk/u_e-checkmk.en.md (100%) rename docs/third_party/{ => exchange_onprem}/third_party-exchange_onprem.de.md (98%) rename docs/third_party/{ => exchange_onprem}/third_party-exchange_onprem.en.md (98%) rename docs/third_party/{ => gitea}/third_party-gitea.de.md (100%) rename docs/third_party/{ => gitea}/third_party-gitea.en.md (100%) rename docs/third_party/{ => gogs}/third_party-gogs.de.md (100%) rename docs/third_party/{ => gogs}/third_party-gogs.en.md (100%) rename docs/third_party/{ => mailman3}/third_party-mailman3.de.md (95%) rename docs/third_party/{ => mailman3}/third_party-mailman3.en.md (96%) rename docs/third_party/{ => mailpiler}/third_party-mailpiler_integration.de.md (100%) rename docs/third_party/{ => mailpiler}/third_party-mailpiler_integration.en.md (100%) rename docs/third_party/{ => nextcloud}/third_party-nextcloud.de.md (98%) rename docs/third_party/{ => nextcloud}/third_party-nextcloud.en.md (98%) rename docs/third_party/{ => portainer}/third_party-portainer.de.md (100%) rename docs/third_party/{ => portainer}/third_party-portainer.en.md (100%) rename docs/third_party/{ => roundcube}/third_party-roundcube.de.md (100%) rename docs/third_party/{ => roundcube}/third_party-roundcube.en.md (100%) diff --git a/docs/post_installation/firststeps-ssl.de.md b/docs/post_installation/firststeps-ssl.de.md index e2831273a..631694262 100644 --- a/docs/post_installation/firststeps-ssl.de.md +++ b/docs/post_installation/firststeps-ssl.de.md @@ -121,7 +121,7 @@ Starten Sie die betroffenen Dienste anschließend neu: ``` docker restart $(docker ps -qaf name=postfix-mailcow) -docker neu starten $(docker ps -qaf name=nginx-mailcow) +docker restart $(docker ps -qaf name=nginx-mailcow) docker restart $(docker ps -qaf name=dovecot-mailcow) ``` diff --git a/docs/third_party/third_party-borgmatic.de.md b/docs/third_party/borgmatic/third_party-borgmatic.de.md similarity index 100% rename from docs/third_party/third_party-borgmatic.de.md rename to docs/third_party/borgmatic/third_party-borgmatic.de.md diff --git a/docs/third_party/third_party-borgmatic.en.md b/docs/third_party/borgmatic/third_party-borgmatic.en.md similarity index 100% rename from docs/third_party/third_party-borgmatic.en.md rename to docs/third_party/borgmatic/third_party-borgmatic.en.md diff --git a/docs/manual-guides/checkmk/u_e-checkmk.de.md b/docs/third_party/checkmk/u_e-checkmk.de.md similarity index 100% rename from docs/manual-guides/checkmk/u_e-checkmk.de.md rename to docs/third_party/checkmk/u_e-checkmk.de.md diff --git a/docs/manual-guides/checkmk/u_e-checkmk.en.md b/docs/third_party/checkmk/u_e-checkmk.en.md similarity index 100% rename from docs/manual-guides/checkmk/u_e-checkmk.en.md rename to docs/third_party/checkmk/u_e-checkmk.en.md diff --git a/docs/third_party/third_party-exchange_onprem.de.md b/docs/third_party/exchange_onprem/third_party-exchange_onprem.de.md similarity index 98% rename from docs/third_party/third_party-exchange_onprem.de.md rename to docs/third_party/exchange_onprem/third_party-exchange_onprem.de.md index a31d3ca45..e5a2e60a3 100644 --- a/docs/third_party/third_party-exchange_onprem.de.md +++ b/docs/third_party/exchange_onprem/third_party-exchange_onprem.de.md @@ -16,7 +16,7 @@ Dieses Setup ist sehr praktisch, wenn Sie die [Office 365 Sicherheitsvorgaben](h Ihre Mailcow muss alle Mails an Ihren personalisierten Exchange Host weiterleiten. Es ist die gleiche Host-Adresse, die wir bereits für den mx Record gesucht haben. 1. Fügen Sie die Domain zu Ihrer Mailcow hinzu -2. [Fügen Sie Ihre personalisierte Exchange Host Adresse als relayhost hinzu](../manual-guides/Postfix/u_e-postfix-relayhost.md) +2. [Fügen Sie Ihre personalisierte Exchange Host Adresse als relayhost hinzu](../../manual-guides/Postfix/u_e-postfix-relayhost.de.md) 3. Fügen Sie Ihre personalisierte Exchange Host Adresse als Weiterleitungshost hinzu, um alle weitergeleiteten Mails von Exchange bedingungslos zu akzeptieren. (Admin > Konfiguration & Details > Konfigurations-Dropdown > Weiterleitungshosts) 4. Gehen Sie zu den Domäneneinstellungen und wählen Sie den neu hinzugefügten Host in der Dropdown-Liste "Absenderabhängige Transporte" aus. Aktivieren Sie die Weiterleitung, indem Sie die Kontrollkästchen "Diese Domäne weiterleiten", "Alle Empfänger weiterleiten" und "Nur nicht vorhandene Postfächer weiterleiten" aktivieren. diff --git a/docs/third_party/third_party-exchange_onprem.en.md b/docs/third_party/exchange_onprem/third_party-exchange_onprem.en.md similarity index 98% rename from docs/third_party/third_party-exchange_onprem.en.md rename to docs/third_party/exchange_onprem/third_party-exchange_onprem.en.md index 669f922b2..b4ac2011f 100644 --- a/docs/third_party/third_party-exchange_onprem.en.md +++ b/docs/third_party/exchange_onprem/third_party-exchange_onprem.en.md @@ -16,7 +16,7 @@ This setup becomes very handy if you have enabled the [Office 365 security defau Your mailcow needs to relay all mails to your personalized Exchange Host. It is the same host address we already looked up for the mx Record. 1. Add the domain to your mailcow -2. [Add your personalized Exchange Host address as relayhost](../manual-guides/Postfix/u_e-postfix-relayhost.md) +2. [Add your personalized Exchange Host address as relayhost](../../manual-guides/Postfix/u_e-postfix-relayhost.en.md) 3. Add your personalized Exchange Host address as forwarding host to unconditionally accepted all relayed mails from Exchange. (Admin > Configuration & Details > Configuration Dropdown > Forwarding Hosts) 4. Go to the domain settings and select the newly added host on the `Sender-dependent transports` dropdown. Enable relaying by ticking the `Relay this domain`, `Relay all recipients` and the `Relay non-existing mailboxes only.` checkboxes diff --git a/docs/third_party/third_party-gitea.de.md b/docs/third_party/gitea/third_party-gitea.de.md similarity index 100% rename from docs/third_party/third_party-gitea.de.md rename to docs/third_party/gitea/third_party-gitea.de.md diff --git a/docs/third_party/third_party-gitea.en.md b/docs/third_party/gitea/third_party-gitea.en.md similarity index 100% rename from docs/third_party/third_party-gitea.en.md rename to docs/third_party/gitea/third_party-gitea.en.md diff --git a/docs/third_party/third_party-gogs.de.md b/docs/third_party/gogs/third_party-gogs.de.md similarity index 100% rename from docs/third_party/third_party-gogs.de.md rename to docs/third_party/gogs/third_party-gogs.de.md diff --git a/docs/third_party/third_party-gogs.en.md b/docs/third_party/gogs/third_party-gogs.en.md similarity index 100% rename from docs/third_party/third_party-gogs.en.md rename to docs/third_party/gogs/third_party-gogs.en.md diff --git a/docs/third_party/third_party-mailman3.de.md b/docs/third_party/mailman3/third_party-mailman3.de.md similarity index 95% rename from docs/third_party/third_party-mailman3.de.md rename to docs/third_party/mailman3/third_party-mailman3.de.md index 48b3860a3..d167207d1 100644 --- a/docs/third_party/third_party-mailman3.de.md +++ b/docs/third_party/mailman3/third_party-mailman3.de.md @@ -32,7 +32,7 @@ Diese Anleitung basiert auf verschiedenen Schritten: ### DNS-Einrichtung -Der größte Teil der Konfiguration ist in *mailcow*s [DNS Konfiguration](../prerequisite/prerequisite-dns.md) enthalten. Nachdem diese Einrichtung abgeschlossen ist, fügen Sie eine weitere Subdomain für *Mailman* hinzu, z.B. `lists.example.org`, die auf denselben Server zeigt: +Der größte Teil der Konfiguration ist in *mailcow*s [DNS Konfiguration](../../prerequisite/prerequisite-dns.de.md) enthalten. Nachdem diese Einrichtung abgeschlossen ist, fügen Sie eine weitere Subdomain für *Mailman* hinzu, z.B. `lists.example.org`, die auf denselben Server zeigt: ``` # Name Typ Wert @@ -90,7 +90,7 @@ certbot certonly -d MAILMAN_DOMAIN #### Installieren Sie mailcow -Folgen Sie der [mailcow installation](../i_u_m/i_u_m_install.md). **Schritt 5 auslassen und nicht mit `docker-compose` starten!** +Folgen Sie der [mailcow installation](../../i_u_m/i_u_m_install.de.md). **Schritt 5 auslassen und nicht mit `docker-compose` starten!** #### Mailcow konfigurieren @@ -301,13 +301,13 @@ docker-compose restart postfix-mailcow ## Update -**mailcow** hat sein eigenes Update-Skript in `/opt/mailcow-dockerized/update.sh`, [siehe die Dokumentation](../i_u_m/i_u_m_update.md). +**mailcow** hat sein eigenes Update-Skript in `/opt/mailcow-dockerized/update.sh`, [siehe die Dokumentation](../../i_u_m/i_u_m_update.de.md). Für **Mailman** holen Sie sich einfach die neueste Version aus dem [github repository](https://github.com/maxking/docker-mailman). ## Sicherung -**mailcow** hat ein eigenes Backup-Skript. [Lies die Docs](../backup_restore/b_n_r-backup.md) für weitere Informationen. +**mailcow** hat ein eigenes Backup-Skript. [Lies die Docs](../../backup_restore/b_n_r-backup.de.md) für weitere Informationen. **Mailman** gibt keine Backup-Anweisungen in der README.md an. Im [gitbucket von pgollor](https://gitbucket.pgollor.de/docker/mailman-mailcow-integration/blob/master/mailman-backup.sh) befindet sich ein Skript, das hilfreich sein könnte. diff --git a/docs/third_party/third_party-mailman3.en.md b/docs/third_party/mailman3/third_party-mailman3.en.md similarity index 96% rename from docs/third_party/third_party-mailman3.en.md rename to docs/third_party/mailman3/third_party-mailman3.en.md index 55549f624..9834bd001 100644 --- a/docs/third_party/third_party-mailman3.en.md +++ b/docs/third_party/mailman3/third_party-mailman3.en.md @@ -32,7 +32,7 @@ This guide is based on different steps: ### DNS setup -Most of the configuration is covered by *mailcow*s [DNS setup](../prerequisite/prerequisite-dns.md). After finishing this setup add another subdomain for *Mailman*, e.g. `lists.example.org` that points to the same server: +Most of the configuration is covered by *mailcow*s [DNS setup](../../prerequisite/prerequisite-dns.en.md). After finishing this setup add another subdomain for *Mailman*, e.g. `lists.example.org` that points to the same server: ``` # Name Type Value @@ -91,7 +91,7 @@ certbot certonly -d MAILMAN_DOMAIN #### Install mailcow -Follow the [mailcow installation](../i_u_m/i_u_m_install.md). **Omit step 5 and do not pull and up with `docker-compose`!** +Follow the [mailcow installation](../../i_u_m/i_u_m_install.en.md). **Omit step 5 and do not pull and up with `docker-compose`!** #### Configure mailcow @@ -302,13 +302,13 @@ docker-compose restart postfix-mailcow ## Update -**mailcow** has it's own update script in `/opt/mailcow-dockerized/update.sh`, [see the docs](../i_u_m/i_u_m_update.md). +**mailcow** has it's own update script in `/opt/mailcow-dockerized/update.sh`, [see the docs](../../i_u_m/i_u_m_update.en.md). For **Mailman** just fetch the newest version from the [github repository](https://github.com/maxking/docker-mailman). ## Backup -**mailcow** has an own backup script. [Read the docs](../backup_restore/b_n_r-backup.md) for further informations. +**mailcow** has an own backup script. [Read the docs](../../backup_restore/b_n_r-backup.en.md) for further informations. **Mailman** won't state backup instructions in the README.md. In the [gitbucket of pgollor](https://gitbucket.pgollor.de/docker/mailman-mailcow-integration/blob/master/mailman-backup.sh) is a script that may be helpful. diff --git a/docs/third_party/third_party-mailpiler_integration.de.md b/docs/third_party/mailpiler/third_party-mailpiler_integration.de.md similarity index 100% rename from docs/third_party/third_party-mailpiler_integration.de.md rename to docs/third_party/mailpiler/third_party-mailpiler_integration.de.md diff --git a/docs/third_party/third_party-mailpiler_integration.en.md b/docs/third_party/mailpiler/third_party-mailpiler_integration.en.md similarity index 100% rename from docs/third_party/third_party-mailpiler_integration.en.md rename to docs/third_party/mailpiler/third_party-mailpiler_integration.en.md diff --git a/docs/third_party/third_party-nextcloud.de.md b/docs/third_party/nextcloud/third_party-nextcloud.de.md similarity index 98% rename from docs/third_party/third_party-nextcloud.de.md rename to docs/third_party/nextcloud/third_party-nextcloud.de.md index bd1482d1f..85deb0dff 100644 --- a/docs/third_party/third_party-nextcloud.de.md +++ b/docs/third_party/nextcloud/third_party-nextcloud.de.md @@ -6,7 +6,7 @@ Nextcloud kann mit dem [helper script](https://github.com/mailcow/mailcow-docker Für den Fall, dass Sie das Passwort (z.B. für admin) vergessen haben und kein neues anfordern können [über den Passwort-Reset-Link auf dem Login-Bildschirm] (https://docs.nextcloud.com/server/20/admin_manual/configuration_user/reset_admin_password.html?highlight=reset), können Sie durch den Aufruf des Helper-Skripts mit `-r` als Parameter ein neues Passwort setzen. Verwenden Sie diese Option nur, wenn Ihre Nextcloud nicht so konfiguriert ist, dass Sie mailcow zur Authentifizierung verwendet, wie im nächsten Abschnitt beschrieben. -Damit mailcow ein Zertifikat für die Nextcloud Domain generieren kann, muss die Domain unter welcher die Nextcloud später erreichbar sein soll als ADDITIONAL_SAN in die mailcow.conf hinzufügt werden und `docker-compose up -d` zur Übernahme ausgeführt werden. Für weitere Informationen siehe: [Erweitertes SSL](../post_installation/firststeps-ssl.md). +Damit mailcow ein Zertifikat für die Nextcloud Domain generieren kann, muss die Domain unter welcher die Nextcloud später erreichbar sein soll als ADDITIONAL_SAN in die mailcow.conf hinzufügt werden und `docker-compose up -d` zur Übernahme ausgeführt werden. Für weitere Informationen siehe: [Erweitertes SSL](../../post_installation/firststeps-ssl.de.md). ## Hintergrund-Aufgaben diff --git a/docs/third_party/third_party-nextcloud.en.md b/docs/third_party/nextcloud/third_party-nextcloud.en.md similarity index 98% rename from docs/third_party/third_party-nextcloud.en.md rename to docs/third_party/nextcloud/third_party-nextcloud.en.md index 697637b26..99c96aa7b 100644 --- a/docs/third_party/third_party-nextcloud.en.md +++ b/docs/third_party/nextcloud/third_party-nextcloud.en.md @@ -6,7 +6,7 @@ Nextcloud can be set up (parameter `-i`) and removed (parameter `-p`) with the [ In case you have forgotten the password (e.g. for admin) and can't request a new one [via the password reset link on the login screen](https://docs.nextcloud.com/server/20/admin_manual/configuration_user/reset_admin_password.html?highlight=reset) calling the helper script with `-r` as parameter allows you to set a new password. Only use this option if your Nextcloud isn't configured to use mailcow for authentication as described in the next section. -In order for mailcow to generate a a certificate for the nextcloud domain you need to add "nextcloud.domain.tld" to ADDITIONAL_SAN in mailcow.conf and run `docker-compose up -d` to apply. For more informaton refer to: [Advanced SSL](../post_installation/firststeps-ssl.md). +In order for mailcow to generate a a certificate for the nextcloud domain you need to add "nextcloud.domain.tld" to ADDITIONAL_SAN in mailcow.conf and run `docker-compose up -d` to apply. For more informaton refer to: [Advanced SSL](../../post_installation/firststeps-ssl.en.md). ## Background jobs diff --git a/docs/third_party/third_party-portainer.de.md b/docs/third_party/portainer/third_party-portainer.de.md similarity index 100% rename from docs/third_party/third_party-portainer.de.md rename to docs/third_party/portainer/third_party-portainer.de.md diff --git a/docs/third_party/third_party-portainer.en.md b/docs/third_party/portainer/third_party-portainer.en.md similarity index 100% rename from docs/third_party/third_party-portainer.en.md rename to docs/third_party/portainer/third_party-portainer.en.md diff --git a/docs/third_party/third_party-roundcube.de.md b/docs/third_party/roundcube/third_party-roundcube.de.md similarity index 100% rename from docs/third_party/third_party-roundcube.de.md rename to docs/third_party/roundcube/third_party-roundcube.de.md diff --git a/docs/third_party/third_party-roundcube.en.md b/docs/third_party/roundcube/third_party-roundcube.en.md similarity index 100% rename from docs/third_party/third_party-roundcube.en.md rename to docs/third_party/roundcube/third_party-roundcube.en.md diff --git a/mkdocs.yml b/mkdocs.yml index c0ea05f75..62917c816 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -151,15 +151,16 @@ nav: - 'Windows Mail': 'client/client-windows.md' - 'Manual configuration': 'client/client-manual.md' - 'Third party apps': - - 'Borgmatic Backup': 'third_party/third_party-borgmatic.md' - - 'Exchange Hybrid Setup': 'third_party/third_party-exchange_onprem.md' - - 'Gitea': 'third_party/third_party-gitea.md' - - 'Gogs': 'third_party/third_party-gogs.md' - - 'Mailman 3': 'third_party/third_party-mailman3.md' - - 'Mailpiler Integration': 'third_party/third_party-mailpiler_integration.md' - - 'Nextcloud': 'third_party/third_party-nextcloud.md' - - 'Portainer': 'third_party/third_party-portainer.md' - - 'Roundcube': 'third_party/third_party-roundcube.md' + - 'Borgmatic Backup': 'third_party/borgmatic/third_party-borgmatic.md' + - 'CheckMK' : 'third_party/checkmk/u_e-checkmk.md' + - 'Exchange Hybrid Setup': 'third_party/exchange_onprem/third_party-exchange_onprem.md' + - 'Gitea': 'third_party/gitea/third_party-gitea.md' + - 'Gogs': 'third_party/gogs/third_party-gogs.md' + - 'Mailman 3': 'third_party/mailman3/third_party-mailman3.md' + - 'Mailpiler Integration': 'third_party/mailpiler/third_party-mailpiler_integration.md' + - 'Nextcloud': 'third_party/nextcloud/third_party-nextcloud.md' + - 'Portainer': 'third_party/portainer/third_party-portainer.md' + - 'Roundcube': 'third_party/roundcube/third_party-roundcube.md' plugins: - search @@ -361,15 +362,15 @@ plugins: 'client-thunderbird.md': 'client/client-thunderbird.en.md' 'client-windows.md': 'client/client-windows.en.md' 'client-manual.md': 'client/client-manual.en.md' - 'third_party-borgmatic.md': 'third_party/third_party-borgmatic.en.md' - 'third_party-exchange_onprem.md': 'third_party/third_party-exchange_onprem.en.md' - 'third_party-gitea.md': 'third_party/third_party-gitea.en.md' - 'third_party-gogs.md': 'third_party/third_party-gogs.en.md' - 'third_party-mailman3.md': 'third_party/third_party-mailman3.en.md' - 'third_party-mailpiler_integration.md': 'third_party/third_party-mailpiler_integration.en.md' - 'third_party-nextcloud.md': 'third_party/third_party-nextcloud.en.md' - 'third_party-portainer.md': 'third_party/third_party-portainer.en.md' - 'third_party-roundcube.md': 'third_party/third_party-roundcube.en.md' + 'third_party-borgmatic.md': 'third_party/borgmatic/third_party-borgmatic.en.md' + 'third_party-exchange_onprem.md': 'third_party/exchange_onprem/third_party-exchange_onprem.en.md' + 'third_party-gitea.md': 'third_party/gitea/third_party-gitea.en.md' + 'third_party-gogs.md': 'third_party/gogs/third_party-gogs.en.md' + 'third_party-mailman3.md': 'third_party/mailman3/third_party-mailman3.en.md' + 'third_party-mailpiler_integration.md': 'third_party/mailpiler/third_party-mailpiler_integration.en.md' + 'third_party-nextcloud.md': 'third_party/nextcloud/third_party-nextcloud.en.md' + 'third_party-portainer.md': 'third_party/portainer/third_party-portainer.en.md' + 'third_party-roundcube.md': 'third_party/roundcube/third_party-roundcube.en.md' extra: social: @@ -385,4 +386,4 @@ extra: accent: orange extra_css: [ assets/stylesheets/extra.css ] extra_javascript: - - assets/javascripts/client.js + - assets/javascripts/client.js \ No newline at end of file