From 0ea81138e2d528848613f36acb93d31f06b5b11a Mon Sep 17 00:00:00 2001 From: Kris Lamoureux Date: Thu, 2 Nov 2023 21:21:08 -0400 Subject: [PATCH] Improve install and modify Traefik IP restriction --- Vagrantfile | 15 +++++++++++---- traefik/docker-compose.yml | 3 ++- traefik/letsencrypt/acme.json | 0 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 traefik/letsencrypt/acme.json diff --git a/Vagrantfile b/Vagrantfile index 705631f..4bf762d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,11 +2,18 @@ Vagrant.configure("2") do |config| config.vm.box = "debian/bookworm64" config.vm.provision "shell", inline: <<-SHELL set -xe - apt-get update - apt-get install -y curl - curl -fsSL https://get.docker.com | sh - docker swarm init + + # Install Docker + which curl &>/dev/null || (apt-get update && apt-get install -y curl) + which docker &>/dev/null || curl -fsSL https://get.docker.com | sh + + # Swarm? + [ ! "$(docker info | grep -c 'Swarm: active')" -eq 1 ] && docker swarm init + + # Start Traefik compose + mkdir -p /vagrant/traefik/letsencrypt cd /vagrant/traefik || exit 1 docker compose up -d + SHELL end diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml index b129072..dca50e1 100644 --- a/traefik/docker-compose.yml +++ b/traefik/docker-compose.yml @@ -35,7 +35,8 @@ services: - "traefik.http.routers.traefik.middlewares=localonly" - "traefik.http.routers.traefik.service=api@internal" - "traefik.http.routers.traefik.tls=true" - - "traefik.http.middlewares.localonly.ipwhitelist.sourcerange=10.0.0.0/8" + #- "traefik.http.middlewares.localonly.ipwhitelist.sourcerange=10.0.0.0/8" + - "traefik.http.middlewares.localonly.ipwhitelist.sourcerange=172.16.0.0/12,10.0.0.0/8" # vagrant verison whoami: image: "traefik/whoami" networks: diff --git a/traefik/letsencrypt/acme.json b/traefik/letsencrypt/acme.json new file mode 100644 index 0000000..e69de29