From 1d71c963909351bcf1b1fab7b0b1d0893838f53c Mon Sep 17 00:00:00 2001 From: AutoPenguin Date: Wed, 3 Jun 2020 03:36:42 +0000 Subject: [PATCH] Update for leanpub preview --- manuscript/book.txt | 76 ++++++++++++++++++- .../ha-docker-swarm/shared-storage-gluster.md | 10 ++- scripts/markdown-to-markua.sh | 4 +- 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/manuscript/book.txt b/manuscript/book.txt index 46e92c2..7651ce8 100644 --- a/manuscript/book.txt +++ b/manuscript/book.txt @@ -7,4 +7,78 @@ sections/ha-docker-swarm.md ha-docker-swarm/design.md ha-docker-swarm/nodes.md ha-docker-swarm/shared-storage-ceph.md -ha-docker-swarm/shared-storage-gluster.md \ No newline at end of file +ha-docker-swarm/shared-storage-gluster.md +ha-docker-swarm/keepalived.md +ha-docker-swarm/docker-swarm-mode.md +ha-docker-swarm/traefik.md +ha-docker-swarm/traefik-forward-auth.md +ha-docker-swarm/traefik-forward-auth/keycloak.md +ha-docker-swarm/registry.md + +sections/chefs-favorites-docker.md +recipes/autopirate.md +recipes/autopirate/sabnzbd.md +recipes/autopirate/nzbget.md +recipes/autopirate/rtorrent.md +recipes/autopirate/sonarr.md +recipes/autopirate/radarr.md +recipes/autopirate/mylar.md +recipes/autopirate/lazylibrarian.md +recipes/autopirate/headphones.md +recipes/autopirate/lidarr.md +recipes/autopirate/nzbhydra.md +recipes/autopirate/nzbhydra2.md +recipes/autopirate/ombi.md +recipes/autopirate/jackett.md +recipes/autopirate/heimdall.md +recipes/autopirate/end.md + +recipes/duplicity.md +recipes/elkarbackup.md +recipes/emby.md +recipes/homeassistant.md +recipes/homeassistant/ibeacon.md +recipes/huginn.md +recipes/kanboard.md +recipes/miniflux.md +recipes/munin.md +recipes/nextcloud.md +recipes/owntracks.md +recipes/phpipam.md +recipes/plex.md +recipes/privatebin.md +recipes/swarmprom.md + +sections/menu-docker.md +recipes/bitwarden.md +recipes/bookstack.md +recipes/calibre-web.md +recipes/collabora-online.md +recipes/ghost.md +recipes/gitlab.md +recipes/gitlab-runner.md +recipes/gollum.md +recipes/instapy.md +recipes/keycloak.md +recipes/keycloak/create-user.md +recipes/keycloak/authenticate-against-openldap.md +recipes/keycloak/setup-oidc-provider.md +recipes/openldap.md +recipes/mail.md +recipes/minio.md +recipes/piwik.md +recipes/portainer.md +recipes/realms.md +recipes/tiny-tiny-rss.md +recipes/wallabag.md +recipes/wekan.md +recipes/wetty.md + +sections/reference.md +reference/oauth_proxy.md +reference/data_layout.md +reference/networks.md +reference/containers.md +reference/git-docker.md +reference/openvpn.md +reference/troubleshooting.md \ No newline at end of file diff --git a/manuscript/ha-docker-swarm/shared-storage-gluster.md b/manuscript/ha-docker-swarm/shared-storage-gluster.md index 8137310..1db8dc9 100644 --- a/manuscript/ha-docker-swarm/shared-storage-gluster.md +++ b/manuscript/ha-docker-swarm/shared-storage-gluster.md @@ -78,6 +78,7 @@ From the node, run ```gluster peer probe ``` Example output: + ``` [root@glusterfs-server /]# gluster peer probe ds1 peer probe: success. @@ -87,6 +88,7 @@ peer probe: success. Run ```gluster peer status``` on both nodes to confirm that they're properly connected to each other: Example output: + ``` [root@glusterfs-server /]# gluster peer status Number of Peers: 1 @@ -101,7 +103,8 @@ State: Peer in Cluster (Connected) Now we create a *replicated volume* out of our individual "bricks". -Create the gluster volume by running +Create the gluster volume by running: + ``` gluster volume create gv0 replica 2 \ server1:/var/no-direct-write-here/brick1 \ @@ -109,6 +112,7 @@ gluster volume create gv0 replica 2 \ ``` Example output: + ``` [root@glusterfs-server /]# gluster volume create gv0 replica 2 ds1:/var/no-direct-write-here/brick1/gv0 ds3:/var/no-direct-write-here/brick1/gv0 volume create: gv0: success: please start the volume to access data @@ -130,7 +134,6 @@ From one other host, run ```docker exec -it glusterfs-server bash``` to shell in ### Mount gluster volume On the host (i.e., outside of the container - type ```exit``` if you're still shelled in), create a mountpoint for the data, by running ```mkdir /var/data```, add an entry to fstab to ensure the volume is auto-mounted on boot, and ensure the volume is actually _mounted_ if there's a network / boot delay getting access to the gluster volume: - ``` mkdir /var/data MYHOST=`hostname -s` @@ -140,7 +143,8 @@ echo "$MYHOST:/gv0 /var/data glusterfs defaults,_netde mount -a ``` -For some reason, my nodes won't auto-mount this volume on boot. I even tried the trickery below, but they stubbornly refuse to automount. +For some reason, my nodes won't auto-mount this volume on boot. I even tried the trickery below, but they stubbornly refuse to automount: + ``` echo -e "\n\n# Give GlusterFS 10s to start before \ mounting\nsleep 10s && mount -a" >> /etc/rc.local diff --git a/scripts/markdown-to-markua.sh b/scripts/markdown-to-markua.sh index 2b954ca..893c4c3 100755 --- a/scripts/markdown-to-markua.sh +++ b/scripts/markdown-to-markua.sh @@ -17,7 +17,9 @@ do sed -i '/.gif/d' $file # Strip out mkdocs admonitions - sed -i '/\!\!\!/d' $file + sed -i '/!!!/d' $file + + # strip emojis tr -cd '\11\12\15\40-\176' < $file > $file-clean