From 03811580a2c1aac6a6050de40f97d6d1cbc024c5 Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 21:37:18 +0100 Subject: [PATCH 01/18] test --- .github/workflows/gh-pages.yml | 9 +++++---- mkdocs.yml | 8 ++++++++ script.sh | 5 +++++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 script.sh diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 8509b99e3..7feae4106 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout 📥 uses: actions/checkout@v2.4.0 with: - token: '${{ secrets.GHPAGES_ACTION_CHECKOUT_TOKEN_PAT }}' + #token: '${{ secrets.GHPAGES_ACTION_CHECKOUT_TOKEN_PAT }}' fetch-depth: '0' # https://github.com/timvink/mkdocs-git-revision-date-localized-plugin#note-when-using-build-environments - name: Install dependencies 🐄 @@ -24,12 +24,13 @@ jobs: - name: Build site 🔧 run: | mkdocs build --verbose --clean + bash script.sh - name: Deploy 🚀 uses: JamesIves/github-pages-deploy-action@v4.2.3 with: - token: '${{ secrets.GHPAGES_ACTION_DEPLOY_TOKEN_PAT }}' - git-config-name: '${{ secrets.GHPAGES_ACTION_DEPLOY_GITNAME_PAT }}' - git-config-email: '${{ secrets.GHPAGES_ACTION_DEPLOY_GITEMAIL_PAT }}' + #token: '${{ secrets.GHPAGES_ACTION_DEPLOY_TOKEN_PAT }}' + #git-config-name: '${{ secrets.GHPAGES_ACTION_DEPLOY_GITNAME_PAT }}' + #git-config-email: '${{ secrets.GHPAGES_ACTION_DEPLOY_GITEMAIL_PAT }}' branch: gh-pages # The branch the action should deploy to. folder: site # The folder the action should deploy. diff --git a/mkdocs.yml b/mkdocs.yml index 9b5dcae82..f70a9c7d1 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -252,6 +252,14 @@ plugins: 'Third party apps': 'Anwendungen von Drittanbietern' 'Borgmatic Backup': 'Borgmatic-Sicherung' #### End of german translation + - redirects: + redirect_maps: + # 'old': 'new' + 'u_e-mailpiler-integration.md': 'third_party/third_party-mailpiler_integration.en.md' + #'b_n_r_accidental_deletion.md': 'b_n_r-accidental_deletion.md' + #'debug-reset-tls.md': 'debug-reset_tls.md' + ########## + 'third_party-roundcube.md': 'third_party/third_party-roundcube.en.md' extra: social: diff --git a/script.sh b/script.sh new file mode 100644 index 000000000..cf5886470 --- /dev/null +++ b/script.sh @@ -0,0 +1,5 @@ +#/bin/bash +find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do + #echo $f + sed -E 's/\.en\/"[\>|\+]/\/">/' $f +done From ec89b97ea5c8d3bf642a8c0c4cd7dddeb3d8aad2 Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 21:47:13 +0100 Subject: [PATCH 02/18] test --- script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script.sh b/script.sh index cf5886470..e354e4f54 100644 --- a/script.sh +++ b/script.sh @@ -1,5 +1,5 @@ #/bin/bash find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do - #echo $f - sed -E 's/\.en\/"[\>|\+]/\/">/' $f + echo "Fixing redirect $f..." + sed -i -E 's/\.en\/"[\>|\+]/\/">/' $f done From 3eb0d17e3110b07c9b7e237d2b216ed2d8ac3760 Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 21:55:01 +0100 Subject: [PATCH 03/18] test --- script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script.sh b/script.sh index e354e4f54..dc583c8a8 100644 --- a/script.sh +++ b/script.sh @@ -1,5 +1,5 @@ #/bin/bash find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do echo "Fixing redirect $f..." - sed -i -E 's/\.en\/"[\>|\+]/\/">/' $f + sed -i -E 's/\.en\/"/\/"/' $f done From d49c2d806da57390d352990b5808d368f630b64b Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 22:40:45 +0100 Subject: [PATCH 04/18] test --- mkdocs.yml | 116 ++++++++++++++++++++++++++++++++++++++++++++++++----- script.sh | 2 +- 2 files changed, 107 insertions(+), 11 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index f70a9c7d1..53b8c169c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -11,9 +11,9 @@ theme: palette: - scheme: default toggle: - icon: material/toggle-switch-off-outline + icon: material/toggle-switch-off-outline name: Dark Mode - - scheme: slate + - scheme: slate toggle: icon: material/toggle-switch name: Light Mode @@ -33,7 +33,7 @@ markdown_extensions: - pymdownx.mark - pymdownx.tilde - pymdownx.extra - - footnotes + - footnotes nav: - 'Information & Support': 'index.md' @@ -131,7 +131,7 @@ nav: - 'Autodiscover / Autoconfig': 'manual-guides/u_e-autodiscover_config.md' - 'Redirect HTTP to HTTPS': 'manual-guides/u_e-80_to_443.md' - 'Re-enable TLS 1.0 and TLS 1.1': 'manual-guides/u_e-reeanble-weak-protocols.md' - - "Run scripts before and after updates": "manual-guides/u_e-update-hooks.md" + - "Run scripts before and after updates": 'manual-guides/u_e-update-hooks.md' - 'Client Configuration': - 'Overview': 'client/client.md' - 'Android': 'client/client-android.md' @@ -152,12 +152,12 @@ nav: - 'Nextcloud': 'third_party/third_party-nextcloud.md' - 'Portainer': 'third_party/third_party-portainer.md' - 'Roundcube': 'third_party/third_party-roundcube.md' - + plugins: - search - git-revision-date-localized: type: iso_datetime - timezone: Europe/Berlin + timezone: Europe/Berlin - i18n: # <--- Translation plugin default_language: en languages: @@ -172,7 +172,7 @@ plugins: 'Prepare your system': 'Systemvoraussetzungen' 'DNS setup': 'DNS Einstellungen' ### Installation Section - 'Installation, Update & Migration': 'Installation, Update und Migration' + 'Installation, Update & Migration': 'Installation, Update und Migration' ### Post Installation Tasks Section 'Post Installation Tasks': 'Post-Installationsaufgaben' 'Advanced SSL': 'Erweitertes SSL' @@ -254,11 +254,107 @@ plugins: #### End of german translation - redirects: redirect_maps: + # LEGACY # 'old': 'new' 'u_e-mailpiler-integration.md': 'third_party/third_party-mailpiler_integration.en.md' - #'b_n_r_accidental_deletion.md': 'b_n_r-accidental_deletion.md' - #'debug-reset-tls.md': 'debug-reset_tls.md' - ########## + 'b_n_r_accidental_deletion.md': 'backup_restore/b_n_r-accidental_deletion.en.md' + 'debug-reset-tls.md': 'troubleshooting/debug-reset_tls.en.md' + # NEW DUE TO NEW LAYOUT + 'prerequisite-system.md': 'prerequisite/prerequisite-system.en.md' + 'prerequisite-dns.md': 'prerequisite/prerequisite-dns.en.md' + 'i_u_m_install.md': 'i_u_m/i_u_m_install.en.md' + 'i_u_m_update.md': 'i_u_m/i_u_m_update.en.md' + 'i_u_m_migration.md': 'i_u_m/i_u_m_migration.en.md' + 'i_u_m_deinstall.md': 'i_u_m/i_u_m_deinstall.en.md' + 'firststeps-ssl.md': 'post_installation/firststeps-ssl.en.md' + 'firststeps-disable_ipv6.md': 'post_installation/firststeps-disable_ipv6.en.md' + 'firststeps-dmarc_reporting.md': 'post_installation/firststeps-dmarc_reporting.en.md' + '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-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' + 'models/model-acl.md': 'models/model-acl.en.md' + 'models/model-passwd.md': 'models/model-passwd.en.md' + 'model-sender_rcv.md': 'models/model-sender_rcv.en.md' + 'debug.md': 'troubleshooting/debug.en.md' + 'debug-admin_login_sogo.md': 'troubleshooting/debug-admin_login_sogo.en.md' + 'debug-rspamd_memory_leaks.md': 'troubleshooting/debug-rspamd_memory_leaks.en.md' + 'debug-attach_service.md': 'troubleshooting/debug-attach_service.en.md' + 'debug-common_problems.md': 'troubleshooting/debug-common_problems.en.md' + 'debug-logs.md': 'troubleshooting/debug-logs.en.md' + 'debug-mysql_upgrade.md': 'troubleshooting/debug-mysql_upgrade.en.md' + 'debug-mysql_aria.md': 'troubleshooting/debug-mysql_aria.en.md' + 'debug-rm_volumes.md': 'troubleshooting/debug-rm_volumes.en.md' + 'debug-reset_pw.md': 'troubleshooting/debug-reset_pw.en.md' + 'debug-reset_tls.md': 'troubleshooting/debug-reset_tls.en.md' + 'b_n_r-backup.md': 'backup_restore/b_n_r-backup.en.md' + 'b_n_r-restore.md': 'backup_restore/b_n_r-restore.en.md' + 'b_n_r-coldstandby.md': 'backup_restore/b_n_r-coldstandby.en.md' + 'b_n_r-backup_restore-maildir.md': 'backup_restore/b_n_r-backup_restore-maildir.en.md' + 'b_n_r-backup_restore-mysql.md': 'backup_restore/b_n_r-backup_restore-mysql.en.md' + 'b_n_r-accidental_deletion.md': 'backup_restore/b_n_r-accidental_deletion.en.md' + 'u_e-mailcow_ui-bl_wl.md': 'manual-guides/mailcow-UI/u_e-mailcow_ui-bl_wl.en.md' + 'u_e-mailcow_ui-config.md': 'manual-guides/mailcow-UI/u_e-mailcow_ui-config.en.md' + 'u_e-mailcow_ui-css.md': 'manual-guides/mailcow-UI/u_e-mailcow_ui-css.en.md' + 'u_e-mailcow_ui-pushover.md': 'manual-guides/mailcow-UI/u_e-mailcow_ui-pushover.en.md' + 'u_e-mailcow_ui-spamfilter.md': 'manual-guides/mailcow-UI/u_e-mailcow_ui-spamfilter.en.md' + 'u_e-mailcow_ui-tagging.md': 'manual-guides/mailcow-UI/u_e-mailcow_ui-tagging.en.md' + 'u_e-mailcow_ui-spamalias.md': 'manual-guides/mailcow-UI/u_e-mailcow_ui-spamalias.en.md' + 'u_e-mailcow_ui-tfa.md': 'manual-guides/mailcow-UI/u_e-mailcow_ui-tfa.en.md' + 'u_e-mailcow_ui-fido.md': 'manual-guides/mailcow-UI/u_e-mailcow_ui-fido.en.md' + 'u_e-postfix-trust_networks.md': 'manual-guides/Postfix/u_e-postfix-trust_networks.en.md' + 'u_e-postfix-custom_transport.md': 'manual-guides/Postfix/u_e-postfix-custom_transport.en.md' + 'u_e-postfix-extra_cf.md': 'manual-guides/Postfix/u_e-postfix-extra_cf.en.md' + 'u_e-postfix-disable_sender_verification.md': 'manual-guides/Postfix/u_e-postfix-disable_sender_verification.en.md' + 'u_e-postfix-attachment_size.md': 'manual-guides/Postfix/u_e-postfix-attachment_size.en.md' + 'u_e-postfix-relayhost.md': 'manual-guides/Postfix/u_e-postfix-relayhost.en.md' + 'u_e-postfix-pflogsumm.md': 'manual-guides/Postfix/u_e-postfix-pflogsumm.en.md' + 'u_e-postfix-postscreen_whitelist.md': 'manual-guides/Postfix/u_e-postfix-postscreen_whitelist.en.md' + 'u_e-unbound-fwd.md': 'manual-guides/Unbound/u_e-unbound-fwd.en.md' + 'u_e-dovecot-extra_conf.md': 'manual-guides/Dovecot/u_e-dovecot-extra_conf.en.md' + 'u_e-dovecot-any_acl.md': 'manual-guides/Dovecot/u_e-dovecot-any_acl.en.md' + 'u_e-dovecot-expunge.md': 'manual-guides/Dovecot/u_e-dovecot-expunge.en.md' + 'u_e-dovecot-fts.md': 'manual-guides/Dovecot/u_e-dovecot-fts.en.md' + 'u_e-dovecot-idle_interval.md': 'manual-guides/Dovecot/u_e-dovecot-idle_interval.en.md' + 'u_e-dovecot-mail-crypt.md': 'manual-guides/Dovecot/u_e-dovecot-mail-crypt.en.md' + 'u_e-dovecot-more.md': 'manual-guides/Dovecot/u_e-dovecot-more.en.md' + 'u_e-dovecot-vmail-volume.md': 'manual-guides/Dovecot/u_e-dovecot-vmail-volume.en.md' + 'u_e-dovecot-public_folder.md': 'manual-guides/Dovecot/u_e-dovecot-public_folder.en.md' + 'u_e-dovecot-static_master.md': 'manual-guides/Dovecot/u_e-dovecot-static_master.en.md' + 'u_e-dovecot-catchall_vacation.md': 'manual-guides/Dovecot/u_e-dovecot-catchall_vacation.en.md' + 'u_e-nginx_webmail-site.md': 'manual-guides/Nginx/u_e-nginx_webmail-site.en.md' + 'u_e-nginx_custom.md': 'manual-guides/Nginx/u_e-nginx_custom.en.md' + 'u_e-watchdog-thresholds.md': 'manual-guides/Watchdog/u_e-watchdog-thresholds.en.md' + 'u_e-redis.md': 'manual-guides/Redis/u_e-redis.en.md' + 'u_e-rspamd.md': 'manual-guides/Rspamd/u_e-rspamd.en.md' + 'u_e-sogo.md': 'manual-guides/SOGo/u_e-sogo.en.md' + 'u_e-docker-cust_dockerfiles.md': 'manual-guides/Docker/u_e-docker-cust_dockerfiles.en.md' + 'u_e-docker-dc_bash_compl.md': 'manual-guides/Docker/u_e-docker-dc_bash_compl.en.md' + 'u_e-why_unbound.md': 'manual-guides/u_e-why_unbound.en.md' + 'u_e-autodiscover_config.md': 'manual-guides/u_e-autodiscover_config.en.md' + 'u_e-80_to_443.md': 'manual-guides/u_e-80_to_443.en.md' + 'u_e-reeanble-weak-protocols.md': 'manual-guides/u_e-reeanble-weak-protocols.en.md' + 'u_e-update-hooks.md': 'manual-guides/u_e-update-hooks.en.md' + 'client.md': 'client/client.en.md' + 'client-android.m': 'client/client-android.en.md' + 'client-apple.md': 'client/client-apple.en.md' + 'client-emclient.md': 'client/client-emclient.en.md' + 'client-kontact.md': 'client/client-kontact.en.md' + 'client-outlook.md': 'client/client-outlook.en.md' + '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' extra: diff --git a/script.sh b/script.sh index dc583c8a8..4e08622c7 100644 --- a/script.sh +++ b/script.sh @@ -1,5 +1,5 @@ #/bin/bash find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do - echo "Fixing redirect $f..." + echo "Fixing redirect ''$f' ..." sed -i -E 's/\.en\/"/\/"/' $f done From ded79c45166102cf6c3e2a73654a3a8dba19458c Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 22:42:10 +0100 Subject: [PATCH 05/18] test --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 53b8c169c..93a6c3645 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -254,8 +254,8 @@ plugins: #### End of german translation - redirects: redirect_maps: - # LEGACY # 'old': 'new' + # LEGACY 'u_e-mailpiler-integration.md': 'third_party/third_party-mailpiler_integration.en.md' 'b_n_r_accidental_deletion.md': 'backup_restore/b_n_r-accidental_deletion.en.md' 'debug-reset-tls.md': 'troubleshooting/debug-reset_tls.en.md' From 04742829ac8b63dad6f8f3dc9ace229fa0790b4f Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 22:43:57 +0100 Subject: [PATCH 06/18] test --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 93a6c3645..7c6c3595b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -339,7 +339,7 @@ plugins: 'u_e-reeanble-weak-protocols.md': 'manual-guides/u_e-reeanble-weak-protocols.en.md' 'u_e-update-hooks.md': 'manual-guides/u_e-update-hooks.en.md' 'client.md': 'client/client.en.md' - 'client-android.m': 'client/client-android.en.md' + 'client-android.md': 'client/client-android.en.md' 'client-apple.md': 'client/client-apple.en.md' 'client-emclient.md': 'client/client-emclient.en.md' 'client-kontact.md': 'client/client-kontact.en.md' From 923844e525d607464aae7fa715df82a5b491c951 Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 22:47:08 +0100 Subject: [PATCH 07/18] test --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 26c12cd2f..97aa4c5dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -mkdocs-material>=8.1.8 +mkdocs-material==8.1.10 mkdocs-redirects>=1.0.3 pygments>=2.11.2 mkdocs-static-i18n>=0.18 From 54d5dbb939717e74252092fa22c4f490156ab021 Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 22:52:59 +0100 Subject: [PATCH 08/18] test --- mkdocs.yml | 4 ++-- script.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 7c6c3595b..0c4946db7 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -276,8 +276,8 @@ plugins: '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' - 'models/model-acl.md': 'models/model-acl.en.md' - 'models/model-passwd.md': 'models/model-passwd.en.md' + 'model-acl.md': 'models/model-acl.en.md' + 'model-passwd.md': 'models/model-passwd.en.md' 'model-sender_rcv.md': 'models/model-sender_rcv.en.md' 'debug.md': 'troubleshooting/debug.en.md' 'debug-admin_login_sogo.md': 'troubleshooting/debug-admin_login_sogo.en.md' diff --git a/script.sh b/script.sh index 4e08622c7..45b4c9236 100644 --- a/script.sh +++ b/script.sh @@ -1,5 +1,5 @@ #/bin/bash -find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do - echo "Fixing redirect ''$f' ..." +find ./site/ -maxdepth 3 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do + echo "Fixing redirect ''$f'..." sed -i -E 's/\.en\/"/\/"/' $f done From 6fa2494ecca8bcb0467bc8443138c28a8b413329 Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 22:57:20 +0100 Subject: [PATCH 09/18] test --- script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script.sh b/script.sh index 45b4c9236..2f203b726 100644 --- a/script.sh +++ b/script.sh @@ -1,5 +1,5 @@ #/bin/bash -find ./site/ -maxdepth 3 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do +find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do echo "Fixing redirect ''$f'..." sed -i -E 's/\.en\/"/\/"/' $f done From 882c3c2bcefbe4778d685a6e0295cd37f3d512de Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 23:01:31 +0100 Subject: [PATCH 10/18] test --- requirements.txt | 2 +- script.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 97aa4c5dc..6edf417aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -mkdocs-material==8.1.10 +mkdocs-material==8.1.11 mkdocs-redirects>=1.0.3 pygments>=2.11.2 mkdocs-static-i18n>=0.18 diff --git a/script.sh b/script.sh index 2f203b726..43bb3ec10 100644 --- a/script.sh +++ b/script.sh @@ -1,5 +1,5 @@ #/bin/bash find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do - echo "Fixing redirect ''$f'..." + echo "Fixing redirect '$f'..." sed -i -E 's/\.en\/"/\/"/' $f done From 21e7a8245aff83f9847639505d5ca281f5f41643 Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 10 Feb 2022 23:03:39 +0100 Subject: [PATCH 11/18] test --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6edf417aa..97aa4c5dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -mkdocs-material==8.1.11 +mkdocs-material==8.1.10 mkdocs-redirects>=1.0.3 pygments>=2.11.2 mkdocs-static-i18n>=0.18 From fa531b7e267b297f0a38f04ffbaafbd354094780 Mon Sep 17 00:00:00 2001 From: Peter Date: Sat, 12 Feb 2022 20:16:05 +0100 Subject: [PATCH 12/18] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 97aa4c5dc..e4c6f910a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -mkdocs-material==8.1.10 +mkdocs-material==8.1.11 mkdocs-redirects>=1.0.3 pygments>=2.11.2 mkdocs-static-i18n>=0.18 -mkdocs-git-revision-date-localized-plugin>=0.11.1 \ No newline at end of file +mkdocs-git-revision-date-localized-plugin>=0.11.1 From ae5bae4dcad722533c67ac7a9ce3d7c12a48bc79 Mon Sep 17 00:00:00 2001 From: Peter Date: Sun, 13 Feb 2022 13:54:04 +0100 Subject: [PATCH 13/18] test --- mkdocs.yml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 0c4946db7..b275cf504 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -359,7 +359,7 @@ plugins: extra: social: - - icon: fontawesome/solid/globe-americas + - icon: fontawesome/solid/earth-americas link: https://mailcow.email - icon: fontawesome/brands/github-alt link: https://github.com/mailcow diff --git a/requirements.txt b/requirements.txt index 97aa4c5dc..6edf417aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -mkdocs-material==8.1.10 +mkdocs-material==8.1.11 mkdocs-redirects>=1.0.3 pygments>=2.11.2 mkdocs-static-i18n>=0.18 From 5befa1dd0f3295cfc9ae92ef0effc38db4d96396 Mon Sep 17 00:00:00 2001 From: Peter Date: Sun, 13 Feb 2022 14:05:03 +0100 Subject: [PATCH 14/18] test --- script.sh => .github/workflows/fix_redirects.sh | 2 ++ .github/workflows/gh-pages.yml | 5 ++++- .github/workflows/renovate_check-build.yml | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) rename script.sh => .github/workflows/fix_redirects.sh (86%) diff --git a/script.sh b/.github/workflows/fix_redirects.sh similarity index 86% rename from script.sh rename to .github/workflows/fix_redirects.sh index 43bb3ec10..278445d26 100644 --- a/script.sh +++ b/.github/workflows/fix_redirects.sh @@ -1,4 +1,6 @@ #/bin/bash +cd ../../ # go in docsdir +ls -lah find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do echo "Fixing redirect '$f'..." sed -i -E 's/\.en\/"/\/"/' $f diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 7feae4106..c3bdf03ec 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -24,7 +24,10 @@ jobs: - name: Build site 🔧 run: | mkdocs build --verbose --clean - bash script.sh + + - name: Fixing redirects 🚧 + run: | + bash fix_redirects.sh - name: Deploy 🚀 uses: JamesIves/github-pages-deploy-action@v4.2.3 diff --git a/.github/workflows/renovate_check-build.yml b/.github/workflows/renovate_check-build.yml index 8a58e7eeb..6e75525e2 100644 --- a/.github/workflows/renovate_check-build.yml +++ b/.github/workflows/renovate_check-build.yml @@ -22,3 +22,7 @@ jobs: - name: Build site 🔧 run: | mkdocs build --verbose --clean + + - name: Fixing redirects 🚧 + run: | + bash fix_redirects.sh From 372e56191399af40b1b47058d6addbe5324610a2 Mon Sep 17 00:00:00 2001 From: Peter Date: Sun, 13 Feb 2022 14:07:16 +0100 Subject: [PATCH 15/18] test --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index c3bdf03ec..934d57d94 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -27,7 +27,7 @@ jobs: - name: Fixing redirects 🚧 run: | - bash fix_redirects.sh + bash .github/workflows/fix_redirects.sh - name: Deploy 🚀 uses: JamesIves/github-pages-deploy-action@v4.2.3 From d2844a02ae1ad4bd214f4d2320210af1bf82231c Mon Sep 17 00:00:00 2001 From: Peter Date: Sun, 13 Feb 2022 14:10:14 +0100 Subject: [PATCH 16/18] test --- .github/workflows/fix_redirects.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/fix_redirects.sh b/.github/workflows/fix_redirects.sh index 278445d26..8e635af4f 100644 --- a/.github/workflows/fix_redirects.sh +++ b/.github/workflows/fix_redirects.sh @@ -1,7 +1,5 @@ #/bin/bash -cd ../../ # go in docsdir -ls -lah -find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do +find ../site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path '../site/de/*' -not -path '../site/en/*' | while read f; do echo "Fixing redirect '$f'..." sed -i -E 's/\.en\/"/\/"/' $f done From ae70aa25f16cfe1b613771056036af4a51308f91 Mon Sep 17 00:00:00 2001 From: Peter Date: Sun, 13 Feb 2022 14:11:52 +0100 Subject: [PATCH 17/18] test --- .github/workflows/fix_redirects.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fix_redirects.sh b/.github/workflows/fix_redirects.sh index 8e635af4f..45c0a7f8f 100644 --- a/.github/workflows/fix_redirects.sh +++ b/.github/workflows/fix_redirects.sh @@ -1,5 +1,8 @@ #/bin/bash -find ../site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path '../site/de/*' -not -path '../site/en/*' | while read f; do +ls . -lah +ls ../ -lah +ls ../../ -lah +find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do echo "Fixing redirect '$f'..." sed -i -E 's/\.en\/"/\/"/' $f done From dca509d7cdf5dab7cb575966508c9cfb799325f5 Mon Sep 17 00:00:00 2001 From: Peter Date: Sun, 13 Feb 2022 14:15:27 +0100 Subject: [PATCH 18/18] test --- .github/workflows/fix_redirects.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/fix_redirects.sh b/.github/workflows/fix_redirects.sh index 45c0a7f8f..43bb3ec10 100644 --- a/.github/workflows/fix_redirects.sh +++ b/.github/workflows/fix_redirects.sh @@ -1,7 +1,4 @@ #/bin/bash -ls . -lah -ls ../ -lah -ls ../../ -lah find ./site/ -maxdepth 2 -mindepth 2 -type f -name 'index.html' -not -path './site/de/*' -not -path './site/en/*' | while read f; do echo "Fixing redirect '$f'..." sed -i -E 's/\.en\/"/\/"/' $f