Merge branch 'main' into feature/upgrade-ansible

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"
         ]

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",

os/config/roles/network/templates/rules.v6

@@ -40,6 +40,8 @@
 -A DEUXFLEURS-TRUSTED-NET -s 2001:41d0:8:ba0b::1/64 -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