From a0026761fffddb88a35878a1a639426eca6504e8 Mon Sep 17 00:00:00 2001
From: David Young <davidy@funkypenguin.co.nz>
Date: Wed, 6 Jul 2022 11:08:25 +1200
Subject: [PATCH] Fix discourse embed

Signed-off-by: David Young <davidy@funkypenguin.co.nz>
---
 .github/ISSUE_TEMPLATE/config.yml              | 2 +-
 .github/ISSUE_TEMPLATE/support-request.md      | 2 +-
 Dockerfile                                     | 3 ++-
 README.md                                      | 6 +++---
 _snippets/recipe-footer.md                     | 2 +-
 manuscript/community/discourse.md              | 2 +-
 manuscript/docker-swarm/shared-storage-ceph.md | 2 +-
 manuscript/index.md                            | 2 +-
 manuscript/recipes/mail.md                     | 2 +-
 manuscript/recipes/nextcloud.md                | 2 +-
 manuscript/recipes/photoprism.md               | 2 +-
 manuscript/support.md                          | 6 +++---
 mkdocs.yml                                     | 1 +
 requirements.txt                               | 3 ++-
 14 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 06ad5a3..f2a28dd 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,5 @@ contact_links:
     url: http://chat.funkypenguin.co.nz/
     about: For real-time, short-lived help, from whichever geeks happen to be online
   - name: Discourse Forums
-    url: https://discourse.geek-kitchen.funkypenguin.co.nz/
+    url: https://forum.funkypenguin.co.nz/
     about: For asyncronous, long-lived discussions
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/support-request.md b/.github/ISSUE_TEMPLATE/support-request.md
index 3225e8b..655d307 100644
--- a/.github/ISSUE_TEMPLATE/support-request.md
+++ b/.github/ISSUE_TEMPLATE/support-request.md
@@ -15,5 +15,5 @@ We primarily use GitHub issues to track changes needed to be made to the cookboo
 ---
 
 * Real-time chat: http://chat.funkypenguin.co.nz
-* Discussion forums: https://discourse.geek-kitchen.funkypenguin.co.nz
+* Discussion forums: https://forum.funkypenguin.co.nz
 * Details: https://geek-cookbook.funkypenguin.co.nz/support/
diff --git a/Dockerfile b/Dockerfile
index a1aa482..39518e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,4 +6,5 @@ RUN pip install \
         mkdocs-htmlproofer-plugin \
 	mkdocs-git-revision-date-localized-plugin \
         mkdocs-macros-plugin \
-        mkdocs-git-committers-plugin-2
+        mkdocs-git-committers-plugin-2 \
+        mkdocs-meta-descriptions-plugin
diff --git a/README.md b/README.md
index dc52d92..4c5ef58 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 
 [cookbookurl]: https://geek-cookbook.funkypenguin.co.nz
-[discourseurl]: https://discourse.geek-kitchen.funkypenguin.co.nz
+[discourseurl]: https://forum.funkypenguin.co.nz
 [discordurl]: http://chat.funkypenguin.co.nz
 [patreonurl]: https://patreon.com/funkypenguin
 [blogurl]: https://www.funkypenguin.co.nz
@@ -14,7 +14,7 @@
 
 [![geek-cookbook](https://raw.githubusercontent.com/geek-cookbook/autopenguin/master/images/readme_header.png)][cookbookurl]
 [![Discord](https://img.shields.io/discord/396055506072109067?color=black&label=Hot%20Sweaty%20Geeks&logo=discord&logoColor=white&style=for-the-badge)][discordurl]
-[![Forums](https://img.shields.io/discourse/topics?color=black&label=Forums&logo=discourse&logoColor=white&server=https%3A%2F%2Fdiscourse.geek-kitchen.funkypenguin.co.nz&style=for-the-badge)][discourseurl]
+[![Forums](https://img.shields.io/discourse/topics?color=black&label=Forums&logo=discourse&logoColor=white&server=https%3A%2F%2Fforum.funkypenguin.co.nz&style=for-the-badge)][discourseurl]
 [![Cookbook](https://img.shields.io/badge/Recipes-44-black?style=for-the-badge&color=black)][cookbookurl]
 [![Twitch Status](https://img.shields.io/twitch/status/funkypenguinnz?style=for-the-badge&label=LiveGeeking&logoColor=white&logo=twitch)][twitchurl]
 
@@ -97,7 +97,7 @@ Impulsively **[click here (NOW quick do it!)][github_sponsor]** to [sponsor me][
 [patreon]:          https://www.patreon.com/bePatron?u=6982506
 [github_sponsor]:   https://github.com/sponsors/funkypenguin
 [github]:           https://github.com/sponsors/funkypenguin
-[discourse]:        https://discourse.geek-kitchen.funkypenguin.co.nz/
+[discourse]:        https://forum.funkypenguin.co.nz/
 [twitter]:          https://twitter.com/funkypenguin
 [contact]:          https://www.funkypenguin.co.nz
 
diff --git a/_snippets/recipe-footer.md b/_snippets/recipe-footer.md
index 8ac4565..ca88547 100644
--- a/_snippets/recipe-footer.md
+++ b/_snippets/recipe-footer.md
@@ -23,7 +23,7 @@ Want to know now when this recipe gets updated, or when future recipes are added
 <div id='discourse-comments'></div>
 
 <script type="text/javascript">
-  DiscourseEmbed = { discourseUrl: 'https://discourse.geek-kitchen.funkypenguin.co.nz/',
+  DiscourseEmbed = { discourseUrl: 'https://forum.funkypenguin.co.nz/',
                      discourseEmbedUrl: window.location.protocol + '//' + window.location.hostname + window.location.pathname };
 
   (function() {
diff --git a/manuscript/community/discourse.md b/manuscript/community/discourse.md
index dffb29a..f454fd1 100644
--- a/manuscript/community/discourse.md
+++ b/manuscript/community/discourse.md
@@ -1,3 +1,3 @@
 # Discourse
 
-You've found an intentionally un-linked page! This page is under construction, and will be up shortly. In the meantime, head to <https://discourse.geek-kitchen.funkypenguin.co.nz>!
+You've found an intentionally un-linked page! This page is under construction, and will be up shortly. In the meantime, head to <https://forum.funkypenguin.co.nz>!
diff --git a/manuscript/docker-swarm/shared-storage-ceph.md b/manuscript/docker-swarm/shared-storage-ceph.md
index d1c50cf..f1c190c 100644
--- a/manuscript/docker-swarm/shared-storage-ceph.md
+++ b/manuscript/docker-swarm/shared-storage-ceph.md
@@ -171,7 +171,7 @@ mount -a
 ```
 
 ??? note "Additional steps on Debian Buster"
-    The above configuration worked on Ubuntu 18.04 **without** requiring a secret to be defined in `/etc/fstab`. Other users have [reported different results](https://discourse.geek-kitchen.funkypenguin.co.nz/t/shared-storage-ceph-funky-penguins-geek-cookbook/47/108) on Debian Buster, however, so consider trying this variation if you encounter error 22:
+    The above configuration worked on Ubuntu 18.04 **without** requiring a secret to be defined in `/etc/fstab`. Other users have [reported different results](https://forum.funkypenguin.co.nz/t/shared-storage-ceph-funky-penguins-geek-cookbook/47/108) on Debian Buster, however, so consider trying this variation if you encounter error 22:
 
     ```
     apt-get install ceph-common
diff --git a/manuscript/index.md b/manuscript/index.md
index 84deb88..9c2a817 100644
--- a/manuscript/index.md
+++ b/manuscript/index.md
@@ -94,7 +94,7 @@ I want your [support](https://github.com/sponsors/funkypenguin), either in the [
 
 #### Get in touch 💬
 
-* Come and say hi to me and the friendly geeks in the [Discord](http://chat.funkypenguin.co.nz) chat or the [Discourse](https://discourse.geek-kitchen.funkypenguin.co.nz/) forums - say hi, ask a question, or suggest a new recipe!
+* Come and say hi to me and the friendly geeks in the [Discord](http://chat.funkypenguin.co.nz) chat or the [Discourse](https://forum.funkypenguin.co.nz/) forums - say hi, ask a question, or suggest a new recipe!
 * Tweet me up, I'm [@funkypenguin](https://twitter.com/funkypenguin)! 🐦
 * [Contact me](https://www.funkypenguin.co.nz/contact/) by a variety of channels
 
diff --git a/manuscript/recipes/mail.md b/manuscript/recipes/mail.md
index 41b5c7c..a4e2760 100644
--- a/manuscript/recipes/mail.md
+++ b/manuscript/recipes/mail.md
@@ -188,6 +188,6 @@ Launch the mail server stack by running ```docker stack deploy docker-mailserver
 
 [^1]: One of the elements of this design which I didn't appreciate at first is that since the config is entirely file-based, **setup.sh** can be run on any container host, provided it has the shared data mounted. This means that even though docker-mailserver was not designed with docker swarm in mind, it works perfectl with swarm. I.e., from any node, regardless of where the container is actually running, you're able to add/delete email addresses, view logs, etc.
 
-[^2]: If you're using sieve with Rainloop, take note of the [workaround](https://discourse.geek-kitchen.funkypenguin.co.nz/t/mail-server-funky-penguins-geek-cookbook/70/15) identified by [ggilley](https://discourse.geek-kitchen.funkypenguin.co.nz/u/ggilley)
+[^2]: If you're using sieve with Rainloop, take note of the [workaround](https://forum.funkypenguin.co.nz/t/mail-server-funky-penguins-geek-cookbook/70/15) identified by [ggilley](https://forum.funkypenguin.co.nz/u/ggilley)
 
 --8<-- "recipe-footer.md"
diff --git a/manuscript/recipes/nextcloud.md b/manuscript/recipes/nextcloud.md
index 97ddb99..3a8e9ab 100644
--- a/manuscript/recipes/nextcloud.md
+++ b/manuscript/recipes/nextcloud.md
@@ -50,7 +50,7 @@ MYSQL_USER=nextcloud
 MYSQL_PASSWORD=set to something secure>
 ```
 
-Now create a **separate** nextcloud-db-backup.env file, to capture the environment variables necessary to perform the backup. (_If the same variables are shared with the mariadb container, they [cause issues](https://discourse.geek-kitchen.funkypenguin.co.nz/t/nextcloud-funky-penguins-geek-cookbook/254/3?u=funkypenguin) with database access_)
+Now create a **separate** nextcloud-db-backup.env file, to capture the environment variables necessary to perform the backup. (_If the same variables are shared with the mariadb container, they [cause issues](https://forum.funkypenguin.co.nz/t/nextcloud-funky-penguins-geek-cookbook/254/3?u=funkypenguin) with database access_)
 
 ````bash
 # For database backup (keep 7 days daily backups)
diff --git a/manuscript/recipes/photoprism.md b/manuscript/recipes/photoprism.md
index 30abe85..f0d8800 100644
--- a/manuscript/recipes/photoprism.md
+++ b/manuscript/recipes/photoprism.md
@@ -76,7 +76,7 @@ MYSQL_PASSWORD=photoprism
 MYSQL_DATABASE=photoprism
 ```
 
-Now create a **separate** photoprism-db-backup.env file, to capture the environment variables necessary to perform the backup. (_If the same variables are shared with the mariadb container, they [cause issues](https://discourse.geek-kitchen.funkypenguin.co.nz/t/nextcloud-funky-penguins-geek-cookbook/254/3?u=funkypenguin) with database access_)
+Now create a **separate** photoprism-db-backup.env file, to capture the environment variables necessary to perform the backup. (_If the same variables are shared with the mariadb container, they [cause issues](https://forum.funkypenguin.co.nz/t/nextcloud-funky-penguins-geek-cookbook/254/3?u=funkypenguin) with database access_)
 
 ````bash
 # For database backup (keep 7 days daily backups)
diff --git a/manuscript/support.md b/manuscript/support.md
index 586f38d..a6b375a 100644
--- a/manuscript/support.md
+++ b/manuscript/support.md
@@ -71,9 +71,9 @@ A sponsorship is too much commitment, and a book is TL;DR? Hit me up with a [one
 
 [1]: http://chat.funkypenguin.co.nz
 [2]: https://www.youtube.com/watch?v=1qHoSWxVqtE
-[3]: https://discourse.geek-kitchen.funkypenguin.co.nz/
-[4]: https://discourse.geek-kitchen.funkypenguin.co.nz/
-[5]: https://discourse.geek-kitchen.funkypenguin.co.nz/
+[3]: https://forum.funkypenguin.co.nz/
+[4]: https://forum.funkypenguin.co.nz/
+[5]: https://forum.funkypenguin.co.nz/
 [6]: https://github.com/funkypenguin/geek-cookbook/issues
 [7]: https://github.com/sponsors/funkypenguin
 [8]: https://www.patreon.com/funkypenguin
diff --git a/mkdocs.yml b/mkdocs.yml
index ec4d5af..34dadf9 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -36,6 +36,7 @@ plugins:
   git-committers:
       repository: geek-cookbook/geek-cookbook
       token: !ENV GH_TOKEN
+  meta-descriptions: # If not provided, auto-generate a description (https://pypi.org/project/mkdocs-meta-descriptions-plugin/)
 
 #theme_dir: mkdocs-material
 nav:
diff --git a/requirements.txt b/requirements.txt
index 879ddd5..2343725 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,4 +7,5 @@ mkdocs-autolinks-plugin>=0.2.0
 mkdocs-git-revision-date-localized-plugin>=0.4.8
 mkdocs-macros-plugin
 mkdocs-material
-mkdocs-git-committers-plugin-2
\ No newline at end of file
+mkdocs-git-committers-plugin-2
+mkdocs-meta-descriptions-plugin
\ No newline at end of file