Merge branch 'master' of github.com:funkypenguin/geek-cookbook

manuscript/recipes/autopirate.md

@@ -111,8 +111,8 @@ networks:
 
 Now work your way through the list of tools below, adding whichever tools your want to use, and finishing with the **end** section:
 
-* [SABnzbd](/recipes/autopirate/sabnzbd.md)
-* [NZBGet](/recipes/autopirate/nzbget.md)
+* [SABnzbd](/recipes/autopirate/sabnzbd/)
+* [NZBGet](/recipes/autopirate/nzbget/)
 * [RTorrent](/recipes/autopirate/rtorrent/)
 * [Sonarr](/recipes/autopirate/sonarr/)
 * [Radarr](/recipes/autopirate/radarr/)

manuscript/recipes/bitwarden.md

@@ -57,7 +57,7 @@ Create a docker swarm config file in docker-compose syntax (v3), something like
 version: "3"
 services:
   bitwarden:
-    image: mprasil/bitwarden
+    image: bitwardenrs/server
     env_file: /var/data/config/bitwarden/bitwarden.env
     volumes:
       - /etc/localtime:/etc/localtime:ro
@@ -96,6 +96,6 @@ Once you've created your account, jump over to https://bitwarden.com/#download a
 
 ## Chef's Notes 📓
 
-1. You'll notice we're not using the *official* container images (*[all 6 of them required](https://help.bitwarden.com/article/install-on-premise/#install-bitwarden)!)*, but rather a [more lightweight version ideal for self-hosting](https://hub.docker.com/r/mprasil/bitwarden). All of the elements are contained within a single container, and SQLite is used for the database backend.
+1. You'll notice we're not using the *official* container images (*[all 6 of them required](https://help.bitwarden.com/article/install-on-premise/#install-bitwarden)!)*, but rather a [more lightweight version ideal for self-hosting](https://hub.docker.com/r/bitwardenrs/server). All of the elements are contained within a single container, and SQLite is used for the database backend.
 2. As mentioned above, readers should refer to the [dani-garcia/bitwarden_rs wiki](https://github.com/dani-garcia/bitwarden_rs) for details on customizing the behaviour of Bitwarden.
 3. The inclusion of Bitwarden was due to the efforts of @gkoerk in our [Discord server](http://chat.funkypenguin.co.nz)- Thanks Gerry!

manuscript/recipes/keycloak.md

@@ -14,9 +14,9 @@
 !!! Summary
     Existing:
 
-    * [X] [Docker swarm cluster](/ha-docker-swarm/design/) with [persistent shared storage](/ha-docker-swarm/shared-storage-ceph.md)
+    * [X] [Docker swarm cluster](/ha-docker-swarm/design/) with [persistent shared storage](/ha-docker-swarm/shared-storage-ceph/)
     * [X] [Traefik](/ha-docker-swarm/traefik_public) configured per design
-    * [X] DNS entry for the hostname (_i.e. "keycloak.your-domain.com"_) you intend to use, pointed to your [keepalived](ha-docker-swarm/keepalived/) IP
+    * [X] DNS entry for the hostname (_i.e. "keycloak.your-domain.com"_) you intend to use, pointed to your [keepalived](/ha-docker-swarm/keepalived/) IP
 
 ## Preparation
 
@@ -144,4 +144,4 @@ Log into your new instance at https://**YOUR-FQDN**, and login with the user/pas
     [![Common Observatory](../images/common_observatory.png)](https://www.observe.global/)
 
 
-## Chef's Notes
+## Chef's Notes

manuscript/recipes/openldap.md

@@ -429,7 +429,7 @@ networks:
 
 ### Launch OpenLDAP stack
 
-Create the auth_internal overlay network, by running ```docker stack deploy auth -c /var/data/config/openldap/auth.yml`, then launch the OpenLDAP stack by running ```docker stack deploy openldap -c /var/data/config/openldap/openldap.yml```
+Create the auth_internal overlay network, by running ```docker stack deploy auth -c /var/data/config/openldap/auth.yml```, then launch the OpenLDAP stack by running ```docker stack deploy openldap -c /var/data/config/openldap/openldap.yml```
 
 Log into your new LAM instance at https://**YOUR-FQDN**.
 
@@ -447,4 +447,4 @@ Create your users using the "**New User**" button.
 
 ## Chef's Notes 📓
 
-1. The KeyCloak](/recipes/keycloak/authenticate-against-openldap/) recipe illustrates how to integrate KeyCloak with your LDAP directory, giving you a cleaner interface to manage users, and a raft of SSO / OAuth features.
+1. [The KeyCloak](/recipes/keycloak/authenticate-against-openldap/) recipe illustrates how to integrate KeyCloak with your LDAP directory, giving you a cleaner interface to manage users, and a raft of SSO / OAuth features.

manuscript/recipes/owntracks.md

@@ -35,9 +35,8 @@ OAUTH2_PROXY_CLIENT_SECRET=
 OAUTH2_PROXY_COOKIE_SECRET=
 
 OTR_USER=recorder
-OTR_PASSWD=yourpassword
-MQTTHOSTNAME=owntracks.example.com
-HOSTLIST=owntracks.example.com
+OTR_PASS=yourpassword
+OTR_HOST=owntracks.example.com
 ```
 
 ### Setup Docker Swarm