From 1df83c60649cd70d951c883322d96d90641e2396 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 5 Apr 2021 18:28:45 +0200 Subject: [PATCH 1/3] Add iptables rules allowing new IPv6 --- os/config/roles/network/templates/rules.v6 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/os/config/roles/network/templates/rules.v6 b/os/config/roles/network/templates/rules.v6 index e2b94ea..17141b8 100644 --- a/os/config/roles/network/templates/rules.v6 +++ b/os/config/roles/network/templates/rules.v6 @@ -38,6 +38,8 @@ -A DEUXFLEURS-TRUSTED-NET -s 2001:4b98:dc0:41:216:3eff:fe9b:1afb/128 -j DEUXFLEURS-TRUSTED-PORT # Quentin@Rennes -A DEUXFLEURS-TRUSTED-NET -s 2a01:e35:2fdc:dbe0::0/64 -j DEUXFLEURS-TRUSTED-PORT +# Erwan@Rennes +-A DEUXFLEURS-TRUSTED-NET -s 2a01:e0a:260:b5b0::0/64 -j DEUXFLEURS-TRUSTED-PORT # Source address is not trusted -A DEUXFLEURS-TRUSTED-NET -j RETURN From 2ef1a9df5df8cec0539816f00fd28be99ff7d798 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 5 Apr 2021 20:48:33 +0200 Subject: [PATCH 2/3] Update garage --- app/garage/deploy/garage.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/garage/deploy/garage.hcl b/app/garage/deploy/garage.hcl index ed4c8a8..f72b02c 100644 --- a/app/garage/deploy/garage.hcl +++ b/app/garage/deploy/garage.hcl @@ -25,7 +25,7 @@ job "garage" { driver = "docker" config { advertise_ipv6_address = true - image = "lxpz/garage_amd64:v0.2.1" + image = "lxpz/garage_amd64:v0.2.1.4" network_mode = "host" volumes = [ "/mnt/storage/garage/data:/garage/data", From 4ecda8cc8d915247ec449d8841144d037a1bf3e1 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 7 Apr 2021 14:06:02 +0200 Subject: [PATCH 3/3] Updated version of Drone --- app/drone-ci/deploy/drone.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/drone-ci/deploy/drone.hcl b/app/drone-ci/deploy/drone.hcl index 6b8c1e9..ab7e6eb 100644 --- a/app/drone-ci/deploy/drone.hcl +++ b/app/drone-ci/deploy/drone.hcl @@ -14,7 +14,7 @@ job "drone-ci" { task "drone_server" { driver = "docker" config { - image = "drone/drone:1.10.1" + image = "drone/drone:latest" ports = [ "web_port" ] } @@ -94,8 +94,8 @@ EOH network_mode = "host" #image = "drone/drone-runner-nomad:latest" + image = "drone/drone-runner-docker:1.6.3" - image = "drone/drone-runner-docker:latest" volumes = [ "/var/run/docker.sock:/var/run/docker.sock" ]