public/geek-cookbook
1
0
Fork 0
mirror of https://github.com/funkypenguin/geek-cookbook/ synced 2025-12-13 01:36:23 +00:00
Code Issues Releases Wiki Activity

Fixed typos

Browse Source
This commit is contained in:
David Young
2017-10-03 20:36:18 +13:00
parent 6a398c786e
commit 74af61f81b
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manuscript/ha-docker-swarm/docker-swarm-mode.md
View File

@@ -70,9 +70,7 @@ xmw49jt5a1j87a6ihul76gbgy * ds2.funkypenguin.co.nz Ready Active Reach
[root@ds2 davidy]# [root@ds2 davidy]#
```` ````
Repeat the process to add your third node. **You need a new token for the third node, don't re-use the manager token you generated for the second node**. Repeat the process to add your third node.
!!! warning "Seriously. Don't use a token more than once, else it's swarm-rebuilding time."
Finally, ```docker node ls``` should reflect that you have 3 reachable manager nodes, one of whom is the "Leader": Finally, ```docker node ls``` should reflect that you have 3 reachable manager nodes, one of whom is the "Leader":

22
manuscript/recipies/mail.md
View File

@@ -21,12 +21,12 @@ docker-mailserver doesn't include a webmail client, and one is not strictly need
### Setup data locations ### Setup data locations
We'll need several directories to bind-mount into our container, so create them in /var/data/mailserver: We'll need several directories to bind-mount into our container, so create them in /var/data/docker-mailserver:
``` ```
cd /var/data cd /var/data
mkdir mailserver mkdir docker-mailserver
cd mailserver cd docker-mailserver
mkdir {maildata,mailstate,config,letsencrypt} mkdir {maildata,mailstate,config,letsencrypt}
``` ```
@@ -106,18 +106,18 @@ services:
- "587:587" - "587:587"
- "993:993" - "993:993"
volumes: volumes:
- /var/data/mail/maildata:/var/mail - /var/data/docker-mailserver/maildata:/var/mail
- /var/data/mail/mailstate:/var/mail-state - /var/data/docker-mailserver/mailstate:/var/mail-state
- /var/data/mail/config:/tmp/docker-mailserver - /var/data/docker-mailserver/config:/tmp/docker-mailserver
- /var/data/mail/letsencrypt:/etc/letsencrypt - /var/data/docker-mailserver/letsencrypt:/etc/letsencrypt
env_file: /var/data/mail/.env env_file: /var/data/docker-mailserver/docker-mailserver.env
networks: networks:
- internal - internal
deploy: deploy:
replicas: 1 replicas: 1
networks: networks:
traefik: traefik_public:
external: true external: true
internal: internal:
driver: overlay driver: overlay
@@ -129,7 +129,7 @@ networks:
!!! note !!! note
Setup unique static subnets for every stack you deploy. This avoids IP/gateway conflicts which can otherwise occur when you're creating/removing stacks a lot. Setup unique static subnets for every stack you deploy. This avoids IP/gateway conflicts which can otherwise occur when you're creating/removing stacks a lot.
A sample .env file looks like this: A sample docker-mailserver.env file looks like this:
``` ```
ENABLE_SPAMASSASSIN=1 ENABLE_SPAMASSASSIN=1
@@ -148,7 +148,7 @@ SSL_TYPE=letsencrypt
### Launch mailserver ### Launch mailserver
Launch the mail server stack by running ```docker stack deploy mailserver -c <path -to-docker-compose.yml>``` Launch the mail server stack by running ```docker stack deploy docker-mailserver -c <path-to-docker-mailserver.yml>```
## Chef's Notes ## Chef's Notes