diff --git a/docs/manual-guides/u_e-80_to_443.de.md b/docs/manual-guides/u_e-80_to_443.de.md index 174a64b0b..5eb8bc1bc 100644 --- a/docs/manual-guides/u_e-80_to_443.de.md +++ b/docs/manual-guides/u_e-80_to_443.de.md @@ -1,6 +1,6 @@ Seit dem 28. Februar 2017 wird mailcow mit aktivierten Ports 80 und 443 geliefert. -**Verwenden Sie die untenstehende Konfiguration nicht für Reverse-Proxy-Setups**, bitte lesen Sie dazu unsere [Reverse-Proxy-Anleitung](../post_installation/firststeps-rp.md), die einen Redirect von HTTP zu HTTPS beinhaltet. +**Verwenden Sie die untenstehende Konfiguration nicht für Reverse-Proxy-Setups**, bitte lesen Sie dazu unsere [Reverse-Proxy-Anleitung](../post_installation/reverse-proxy/r_p.md), die einen Redirect von HTTP zu HTTPS beinhaltet. Öffne `mailcow.conf` und setze `HTTP_BIND=` - falls nicht bereits gesetzt. @@ -49,4 +49,4 @@ Andernfalls starten Sie Nginx neu: ``` bash docker compose restart - ``` \ No newline at end of file + ``` diff --git a/docs/manual-guides/u_e-80_to_443.en.md b/docs/manual-guides/u_e-80_to_443.en.md index fb9c197a7..1a2bdbdd0 100644 --- a/docs/manual-guides/u_e-80_to_443.en.md +++ b/docs/manual-guides/u_e-80_to_443.en.md @@ -1,6 +1,6 @@ Since February the 28th 2017 mailcow does come with port 80 and 443 enabled. -**Do not use the config below for reverse proxy setups**, please see our [reverse proxy guide](../post_installation/firststeps-rp.md) for this, which includes a redirect from HTTP to HTTPS. +**Do not use the config below for reverse proxy setups**, please see our [reverse proxy guide](../post_installation/reverse-proxy/r_p.md) for this, which includes a redirect from HTTP to HTTPS. Open `mailcow.conf` and set `HTTP_BIND=` - if not already set. @@ -49,4 +49,4 @@ Otherwise restart Nginx: ``` bash docker compose restart - ``` \ No newline at end of file + ``` diff --git a/docs/post_installation/firststeps-ssl.de.md b/docs/post_installation/firststeps-ssl.de.md index 7152878df..4c071f93a 100644 --- a/docs/post_installation/firststeps-ssl.de.md +++ b/docs/post_installation/firststeps-ssl.de.md @@ -235,7 +235,7 @@ docker restart $(docker ps -qaf name=nginx-mailcow) docker restart $(docker ps -qaf name=dovecot-mailcow) ``` -Siehe [Post-Hook-Skript für Nicht-mailcow-ACME-Clients](../firststeps-rp#optional-post-hook-skript-fur-nicht-mailcow-acme-clients) für ein vollständiges Beispielskript. +Siehe [Post-Hook-Skript für Nicht-mailcow-ACME-Clients](../reverse-proxy/r_p#optional-post-hook-skript-fur-nicht-mailcow-acme-clients) für ein vollständiges Beispielskript. ### Test gegen das ACME-Verzeichnis diff --git a/docs/post_installation/firststeps-ssl.en.md b/docs/post_installation/firststeps-ssl.en.md index a3c2dbcea..8ec2f069a 100644 --- a/docs/post_installation/firststeps-ssl.en.md +++ b/docs/post_installation/firststeps-ssl.en.md @@ -235,7 +235,7 @@ docker restart $(docker ps -qaf name=nginx-mailcow) docker restart $(docker ps -qaf name=dovecot-mailcow) ``` -See [Post-hook script for non-mailcow ACME clients](../firststeps-rp/#optional-post-hook-script-for-non-mailcow-acme-clients) for a full example script. +See [Post-hook script for non-mailcow ACME clients](../reverse-proxy/r_p/#optional-post-hook-script-for-non-mailcow-acme-clients) for a full example script. ### Test against staging ACME directory diff --git a/mkdocs.yml b/mkdocs.yml index cee0835fd..a212d8c76 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -68,7 +68,13 @@ nav: - 'IP bindings': 'post_installation/firststeps-ip_bindings.md' - 'Local MTA on Docker host': 'post_installation/firststeps-local_mta.md' - 'Logging': 'post_installation/firststeps-logging.md' - - 'Reverse Proxy': 'post_installation/firststeps-rp.md' + - 'Reverse Proxy': + - 'Overview': 'post_installation/reverse-proxy/r_p.md' + - 'Apache 2.4': 'post_installation/reverse-proxy/r_p-apache24.md' + - 'Nginx': 'post_installation/reverse-proxy/r_p-nginx.md' + - 'HAProxy (community supported)': 'post_installation/reverse-proxy/r_p-haproxy.md' + - 'Traefik v2 (community supported)': 'post_installation/reverse-proxy/r_p-traefik2.md' + - 'Caddy v2 (community supported)': 'post_installation/reverse-proxy/r_p-caddy2.md' - 'Rspamd UI': 'post_installation/firststeps-rspamd_ui.md' - 'SNAT': 'post_installation/firststeps-snat.md' - 'Sync job migration': 'post_installation/firststeps-sync_jobs_migration.md' @@ -199,6 +205,11 @@ plugins: 'Disable IPv6': 'IPv6 deaktivieren' 'IP bindings': 'IP-Bindings' 'Local MTA on Docker host': 'Lokaler MTA auf Docker-Host' + ### Reverse Proxy Subsection + 'Overview': 'Übersicht' + 'HAProxy (community supported)': 'HAProxy (von der Community unterstützt)' + 'Traefik v2 (community supported)': 'Traefik v2 (von der Community unterstützt)' + 'Caddy v2 (community supported)': 'Caddy v2 (von der Community unterstützt)' 'Sync job migration': 'Migration mit Sync Jobs' ### Models Section 'Models': 'Modelle' @@ -270,7 +281,6 @@ plugins: 'Run scripts before and after updates': 'Skripte vor und nach Aktualisierungen ausführen' ### Client Configuration Section 'Client Configuration': 'Client-Konfiguration' - 'Overview': 'Übersicht' 'Manual configuration': 'Manuelle Konfiguration' ### Third party apps Section 'Third party apps': 'Anwendungen von Drittanbietern' @@ -300,7 +310,7 @@ plugins: 'firststeps-ip_bindings.md': 'post_installation/firststeps-ip_bindings.en.md' 'firststeps-local_mta.md': 'post_installation/firststeps-local_mta.en.md' 'firststeps-logging.md': 'post_installation/firststeps-logging.en.md' - 'firststeps-rp.md': 'post_installation/firststeps-rp.en.md' + 'firststeps-rp.md': 'post_installation/reverse-proxy/r_p.en.md' 'firststeps-rspamd_ui.md': 'post_installation/firststeps-rspamd_ui.en.md' 'firststeps-snat.md': 'post_installation/firststeps-snat.en.md' 'firststeps-sync_jobs_migration.md': 'post_installation/firststeps-sync_jobs_migration.en.md'