errors from using src_valid_mark for ipv6, so commented out
This commit is contained in:
@@ -46,12 +46,13 @@ services:
|
||||
- wg
|
||||
hostname: wgnet
|
||||
ports:
|
||||
- 51820:51820
|
||||
- 51820:51820/udp
|
||||
sysctls:
|
||||
- net.ipv4.ip_forward=1
|
||||
- net.ipv4.conf.all.src_valid_mark=1
|
||||
- net.ipv6.conf.all.forwarding=1
|
||||
- net.ipv6.conf.all.src_valid_mark=1
|
||||
# - net.ipv6.conf.all.src_valid_mark=1
|
||||
env_file:
|
||||
- ${HOME}/.all.env
|
||||
labels:
|
||||
@@ -93,72 +94,6 @@ services:
|
||||
# @TODO make subsequent containers have 'network_mode' attrbute set to value 'service:wgclient'/'service:tailclient'
|
||||
# OR make subsequent containers have 'networks' attribute set to list value with 'container:wgclient'/'contaner:tailclient' item
|
||||
|
||||
# @NOTE https://hub.docker.com/_/caddy/
|
||||
# @NOTE https://blog.genxnotes.com/en/tech/how-to-move-the-hugo-public-folder-outside-the-project-root/
|
||||
# @NOTE https://www.turtlestoffel.com/My-Quartz-Configuration#explorer-component-with-custom-content-folder
|
||||
revproxy0:
|
||||
image: caddy:latest
|
||||
container_name: revproxy0
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
restart: unless-stopped
|
||||
expose:
|
||||
- 80
|
||||
- 443
|
||||
- 443/udp
|
||||
volumes:
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
- ~/.config/caddy:/etc/caddy:Z
|
||||
- ~/srv/${SERVER_FQDN}:/srv/${SERVER_FQDN}:z
|
||||
- ~/srv/certbot.${SERVER_FQDN}:/srv/certbot.${SERVER_FQDN}:ro,z
|
||||
- ~/srv/notes.${SERVER_FQDN}:/srv/notes.${SERVER_FQDN}:z
|
||||
- ~/srv/blog.${SERVER_FQDN}:/srv/blog.${SERVER_FQDN}:z
|
||||
- ~/srv/${NEXTCLOUD_SUBDOMAIN}.${SERVER_FQDN}:/srv/${NEXTCLOUD_SUBDOMAIN}.${SERVER_FQDN}:ro,z
|
||||
# - ~/srv/${GITEA_SUBDOMAIN}.${SERVER_FQDN}:/srv/${GITEA_SUBDOMAIN}.${SERVER_FQDN}:ro,z
|
||||
# - ~/srv/${OG_SUBDOMAIN}.${SERVER_FQDN}:/srv/${OG_SUBDOMAIN}.${SERVER_FQDN}:ro,z
|
||||
- "caddy-share:/usr/share/caddy"
|
||||
- "caddy-data:/data:z"
|
||||
- ~/.caddy:/config:Z
|
||||
networks:
|
||||
- wg
|
||||
depends_on:
|
||||
- wgclient
|
||||
env_file:
|
||||
- ${HOME}/.all.env
|
||||
labels:
|
||||
glance.name: Caddy
|
||||
glance.id: caddy
|
||||
glance.icon: "si:caddy"
|
||||
glance.url: "${SERVER_FQDN_SCHEME}://${SERVER_FQDN}"
|
||||
glance.description: HTTPS reverse proxy server
|
||||
|
||||
# @NOTE https://github.com/nbraun1/certbot
|
||||
sslcerts:
|
||||
image: nbraun1/certbot
|
||||
container_name: sslcerts
|
||||
restart: on-failure
|
||||
volumes:
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
- ~/.config/letsencrypt:/etc/letsencrypt:z
|
||||
- "certbot-lib:/var/lib/letsencrypt"
|
||||
- ~/srv/certbot.${SERVER_FQDN}:/srv/certbot.${SERVER_FQDN}:z
|
||||
networks:
|
||||
- wg
|
||||
depends_on:
|
||||
- revproxy0
|
||||
- wgclient
|
||||
env_file:
|
||||
- ${HOME}/.all.env
|
||||
- ${HOME}/.certbot.env
|
||||
environment:
|
||||
EMAIL: ${CERTBOT_EMAIL}
|
||||
DOMAINS: ${CERTBOT_CHALLENGED_DOMAINS:-"${SERVER_FQDN},*.${SERVER_FQDN}"}
|
||||
AUTHENTICATOR: ${CERTBOT_AUTHENTICATOR}
|
||||
WEBROOT_PATH: ${SERVER_WEBROOT_PATH}
|
||||
ISSUANCE_TIMEOUT: 300
|
||||
# CRON: ${CERTBOT_CRON}
|
||||
# entrypoint: ["certonly"]
|
||||
|
||||
cache0:
|
||||
image: redis:trixie
|
||||
container_name: cache0
|
||||
@@ -233,7 +168,6 @@ services:
|
||||
depends_on:
|
||||
- cache0
|
||||
- db0
|
||||
- revproxy0
|
||||
- wgclient
|
||||
env_file:
|
||||
- ${HOME}/.all.env
|
||||
@@ -291,7 +225,6 @@ services:
|
||||
- wg
|
||||
depends_on:
|
||||
- db0
|
||||
- revproxy0
|
||||
- wgclient
|
||||
env_file:
|
||||
- ${HOME}/.all.env
|
||||
@@ -362,7 +295,7 @@ services:
|
||||
networks:
|
||||
- wg
|
||||
depends_on:
|
||||
- revproxy0
|
||||
- db0
|
||||
- wgclient
|
||||
env_file:
|
||||
- ${HOME}/.all.env
|
||||
@@ -386,6 +319,73 @@ services:
|
||||
glance.url: "${SERVER_FQDN_SCHEME}://${OG_SUBDOMAIN}.${SERVER_FQDN}"
|
||||
glance.description: Pastebin server
|
||||
|
||||
# @NOTE https://hub.docker.com/_/caddy/
|
||||
# @NOTE https://blog.genxnotes.com/en/tech/how-to-move-the-hugo-public-folder-outside-the-project-root/
|
||||
# @NOTE https://www.turtlestoffel.com/My-Quartz-Configuration#explorer-component-with-custom-content-folder
|
||||
revproxy0:
|
||||
image: caddy:latest
|
||||
container_name: revproxy0
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
restart: unless-stopped
|
||||
expose:
|
||||
- 80
|
||||
- 443
|
||||
- 443/udp
|
||||
volumes:
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
- ~/.config/caddy:/etc/caddy:Z
|
||||
- ~/srv/${SERVER_FQDN}:/srv/${SERVER_FQDN}:z
|
||||
- ~/srv/notes.${SERVER_FQDN}:/srv/notes.${SERVER_FQDN}:z
|
||||
- ~/srv/blog.${SERVER_FQDN}:/srv/blog.${SERVER_FQDN}:z
|
||||
- ~/srv/certbot.${SERVER_FQDN}:/srv/certbot.${SERVER_FQDN}:ro,z
|
||||
- "caddy-share:/usr/share/caddy"
|
||||
- "caddy-data:/data:z"
|
||||
- ~/.caddy:/config:Z
|
||||
volumes_from:
|
||||
- cloud:ro
|
||||
networks:
|
||||
- wg
|
||||
depends_on:
|
||||
- wgclient
|
||||
env_file:
|
||||
- ${HOME}/.all.env
|
||||
labels:
|
||||
glance.name: Caddy
|
||||
glance.id: caddy
|
||||
glance.icon: "si:caddy"
|
||||
glance.url: "${SERVER_FQDN_SCHEME}://${SERVER_FQDN}"
|
||||
glance.description: HTTPS reverse proxy server
|
||||
|
||||
# @NOTE https://github.com/nbraun1/certbot
|
||||
sslcerts:
|
||||
image: nbraun1/certbot
|
||||
container_name: sslcerts
|
||||
restart: on-failure
|
||||
volumes:
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
- ~/.config/letsencrypt:/etc/letsencrypt:z
|
||||
- "certbot-lib:/var/lib/letsencrypt"
|
||||
# - ~/srv/certbot.${SERVER_FQDN}:/srv/certbot.${SERVER_FQDN}:z
|
||||
volumes_from:
|
||||
- revproxy0:rw
|
||||
networks:
|
||||
- wg
|
||||
depends_on:
|
||||
- revproxy0
|
||||
- wgclient
|
||||
env_file:
|
||||
- ${HOME}/.all.env
|
||||
- ${HOME}/.certbot.env
|
||||
environment:
|
||||
EMAIL: ${CERTBOT_EMAIL}
|
||||
DOMAINS: ${CERTBOT_CHALLENGED_DOMAINS:-"${SERVER_FQDN},*.${SERVER_FQDN}"}
|
||||
AUTHENTICATOR: ${CERTBOT_AUTHENTICATOR}
|
||||
WEBROOT_PATH: ${SERVER_WEBROOT_PATH}
|
||||
ISSUANCE_TIMEOUT: 300
|
||||
CRON: ${CERTBOT_CRON}
|
||||
# entrypoint: ["certonly"]
|
||||
|
||||
dash:
|
||||
image: glanceapp/glance
|
||||
container_name: dash
|
||||
|
||||
Reference in New Issue
Block a user