diff --git a/docker/.env b/docker/.env index 258c18f..b565335 100644 --- a/docker/.env +++ b/docker/.env @@ -9,36 +9,37 @@ TZ=Europe/HelsinkI DOCKERDIR=/gurulandia/data SECRETSDIR=/gurulandia/docker-shared/secrets +##### ProxyName +PROXYNAME=proxy + ##### DOMAIN DOMAINNAME0=gurulandia.eu -DOMAINNAME1=home.gurulandia.eu +DOMAINNAME1=lab.gurulandia.eu DOMAINNAME2=gurulandia.fi DOMAINNAME3=home.gurulandia.fi ##### SUBNETS - -PROXY_SUBNET=192.168.91.0/24 -SOCKET_PROXY_SUBNET=192.168.92.0/24 +#PROXY_SUBNET=192.168.91.0/24 +#SOCKET_PROXY_SUBNET=192.168.92.0/24 ##### GATEWAYS - -PROXY_GATEWAY=192.168.91.1 -SOCKET_PROXY_GATEWAY=192.168.92.1 +#PROXY_GATEWAY=192.168.91.1 +#SOCKET_PROXY_GATEWAY=192.168.92.1 ##### Traefik Container TRAEFIK_CONTAINER_NAME=traefik TRAEFIK_IMAGE=traefik -TRAEFIK_VERSION=v3.0.0-rc1 #latest +TRAEFIK_VERSION=latest TRAEFIK_RESTART_POLICY=unless-stopped -TRAEFIK_IP0=192.168.91.254 -TRAEFIK_IP1=192.168.92.252 +#TRAEFIK_IP0=192.168.91.254 +#TRAEFIK_IP1=192.168.92.252 ##### socket-proxy Container SOCKET_PROXY_CONTAINER_NAME=socket-proxy SOCKET_PROXY_IMAGE=ghcr.io/tecnativa/docker-socket-proxy SOCKET_PROXY_VERSION=latest SOCKET_PROXY_RESTART_POLICY=always -SOCKET_PROXY_IP=192.168.92.254 +#SOCKET_PROXY_IP=192.168.92.254 DOCKER_ENDPOINT=tcp://${SOCKET_PROXY_CONTAINER_NAME}:2375 @@ -64,14 +65,15 @@ CROWDSEC_VERSION=latest CROWDSEC_RESTART_POLICY=unless-stopped #CROWDSEC_COLLECTIONS="crowdsecurity/linux crowdsecurity/traefik" CROWDSEC_COLLECTIONS="crowdsecurity/traefik crowdsecurity/http-cve crowdsecurity/whitelist-good-actors crowdsecurity/iptables crowdsecurity/linux fulljackz/proxmox" -CROWDSEC_IP=192.168.92.253 +#CROWDSEC_IP=192.168.92.253 ##### bouncer-traefik Container BT_CONTAINER_NAME=bouncer-traefik BT_IMAGE=docker.io/fbonalair/traefik-crowdsec-bouncer BT_VERSION=latest BT_RESTART_POLICY=unless-stopped -BT_IP=192.168.92.251 +GIN_MODE=release +#BT_IP=192.168.92.251 ##### IP ADDRESSES diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 398e379..fa05376 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,29 +1,15 @@ ########################### NETWORKS # There is no need to create any networks outside this docker-compose file. -# You may customize the network subnets (192.168.90.0/24 and 91.0/24) below as you please. -# Docker Compose version 3.5 or higher required to define networks this way. networks: proxy: name: proxy driver: bridge - ipam: - config: - - subnet: $PROXY_SUBNET - gateway: $PROXY_GATEWAY socket_proxy: name: socket_proxy driver: bridge - ipam: - config: - - subnet: $SOCKET_PROXY_SUBNET - gateway: $SOCKET_PROXY_GATEWAY ########################### SECRETS #secrets: -# cloudflare_email: -# file: ${SECRETSDIR}/cloudflare_email - #cloudflare_api_token: - # file: ${SECRETSDIR}/cloudflare_api_token #authelia_jwt_secret: # file: $SECRETSDIR/authelia_jwt_secret #authelia_session_secret: