Deuxfleurs/infrastructure
Archived
24
2
Fork 2
Code Issues 22 Pull requests Projects 1 Releases Wiki Activity

Merge branch 'main' into feature/upgrade-ansible

Browse source
This commit is contained in:
Quentin 2021-04-09 11:19:54 +02:00
commit ca1f73d655
Signed by: quentin
GPG key ID: A98E9B769E4FF428
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/drone-ci/deploy/drone.hcl
View file

@ -14,7 +14,7 @@ job "drone-ci" {
task "drone_server" { task "drone_server" {
driver = "docker" driver = "docker"
config { config {
image = "drone/drone:1.10.1" image = "drone/drone:latest"
ports = [ "web_port" ] ports = [ "web_port" ]
} }
@ -94,8 +94,8 @@ EOH
network_mode = "host" network_mode = "host"
#image = "drone/drone-runner-nomad:latest" #image = "drone/drone-runner-nomad:latest"
image = "drone/drone-runner-docker:1.6.3"
image = "drone/drone-runner-docker:latest"
volumes = [ volumes = [
"/var/run/docker.sock:/var/run/docker.sock" "/var/run/docker.sock:/var/run/docker.sock"
] ]

2
app/garage/deploy/garage.hcl
View file

@ -25,7 +25,7 @@ job "garage" {
driver = "docker" driver = "docker"
config { config {
advertise_ipv6_address = true advertise_ipv6_address = true
image = "lxpz/garage_amd64:v0.2.1" image = "lxpz/garage_amd64:v0.2.1.4"
network_mode = "host" network_mode = "host"
volumes = [ volumes = [
"/mnt/storage/garage/data:/garage/data", "/mnt/storage/garage/data:/garage/data",

2
os/config/roles/network/templates/rules.v6
View file

@ -40,6 +40,8 @@
-A DEUXFLEURS-TRUSTED-NET -s 2001:41d0:8:ba0b::1/64 -j DEUXFLEURS-TRUSTED-PORT -A DEUXFLEURS-TRUSTED-NET -s 2001:41d0:8:ba0b::1/64 -j DEUXFLEURS-TRUSTED-PORT
# Quentin@Rennes # Quentin@Rennes
-A DEUXFLEURS-TRUSTED-NET -s 2a01:e35:2fdc:dbe0::0/64 -j DEUXFLEURS-TRUSTED-PORT -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 # Source address is not trusted
-A DEUXFLEURS-TRUSTED-NET -j RETURN -A DEUXFLEURS-TRUSTED-NET -j RETURN