diff options
| -rw-r--r-- | cluster/prod/app/garage/deploy/garage.hcl | 2 | ||||
| -rw-r--r-- | cluster/prod/app/jitsi/deploy/jitsi.hcl | 13 | ||||
| -rw-r--r-- | cluster/prod/site/neptune.nix | 2 | ||||
| -rw-r--r-- | doc/architecture.md | 9 |
4 files changed, 19 insertions, 7 deletions
diff --git a/cluster/prod/app/garage/deploy/garage.hcl b/cluster/prod/app/garage/deploy/garage.hcl index 58ebaf5..b6ea7f6 100644 --- a/cluster/prod/app/garage/deploy/garage.hcl +++ b/cluster/prod/app/garage/deploy/garage.hcl @@ -26,7 +26,7 @@ job "garage" { task "server" { driver = "docker" config { - image = "dxflrs/garage:v1.0.0-rc1" + image = "superboum/garage:v1.0.0-rc1-hotfix-red-ftr-wquorum" command = "/garage" args = [ "server" ] network_mode = "host" diff --git a/cluster/prod/app/jitsi/deploy/jitsi.hcl b/cluster/prod/app/jitsi/deploy/jitsi.hcl index eb505a0..66fec76 100644 --- a/cluster/prod/app/jitsi/deploy/jitsi.hcl +++ b/cluster/prod/app/jitsi/deploy/jitsi.hcl @@ -222,11 +222,14 @@ EOF ] } - env { - # Our container can autodetect the public IP with the ifconfig.me service - # However we would like to avoid relying on a 3rd party service for production use - # That's why I am setting the public IP address statically here VVVV - JITSI_NAT_PUBLIC_IP = "${meta.public_ipv4}" + template { + data = <<EOH + {{ with $a := env "attr.unique.hostname" | printf "diplonat/autodiscovery/ipv4/%s" | key | parseJSON }} + JITSI_NAT_PUBLIC_IP = {{ $a.address }} + {{ end }} + EOH + destination = "secrets/jitsi-videobridge.env" + env = true } template { diff --git a/cluster/prod/site/neptune.nix b/cluster/prod/site/neptune.nix index 5f3e6e2..1631579 100644 --- a/cluster/prod/site/neptune.nix +++ b/cluster/prod/site/neptune.nix @@ -4,5 +4,5 @@ deuxfleurs.siteName = "neptune"; deuxfleurs.staticIPv4.defaultGateway = "192.168.1.254"; deuxfleurs.cnameTarget = "neptune.site.deuxfleurs.fr."; - deuxfleurs.publicIPv4 = "77.207.15.215"; + deuxfleurs.publicIPv4 = "82.67.87.112"; } diff --git a/doc/architecture.md b/doc/architecture.md index 7d36643..96c6918 100644 --- a/doc/architecture.md +++ b/doc/architecture.md @@ -175,3 +175,12 @@ Then, other stuff can be started in any order, e.g.: - `app/cryptpad` - `app/drone-ci` + +## Operating garage + +Garage is operated using its command-line interface, which can be accessed using +any node of the cluster running garage: +``` +docker ps # to find the identifier of the container running garage +docker exec -ti <id> /garage <cli args...> +``` |