aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-04-09 11:19:54 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-04-09 11:19:54 +0200
commitca1f73d655849ca09997c6b7db9fdb24c05d562d (patch)
tree8bd03098420b899b34d98c9f3a23d2f08ed5b971
parentf4c8ba8ebd076fd46439289993155274be7605c4 (diff)
parent4ecda8cc8d915247ec449d8841144d037a1bf3e1 (diff)
downloadinfrastructure-ca1f73d655849ca09997c6b7db9fdb24c05d562d.tar.gz
infrastructure-ca1f73d655849ca09997c6b7db9fdb24c05d562d.zip
Merge branch 'main' into feature/upgrade-ansible
-rw-r--r--app/drone-ci/deploy/drone.hcl4
-rw-r--r--app/garage/deploy/garage.hcl2
-rw-r--r--os/config/roles/network/templates/rules.v62
3 files changed, 5 insertions, 3 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"
]
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",
diff --git a/os/config/roles/network/templates/rules.v6 b/os/config/roles/network/templates/rules.v6
index 6977f02..88b3a07 100644
--- a/os/config/roles/network/templates/rules.v6
+++ b/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