From f4a88fa5659ca658643d3ff07acf9723104d181b Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Tue, 27 Oct 2020 23:25:30 +0100
Subject: [PATCH] Docker does not use IPv6, switching to "network=host"

---
 app/config/configuration/directory/bottin/config.json | 2 +-
 app/deployment/bottin2.hcl                            | 3 ++-
 app/deployment/postgres.hcl                           | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/config/configuration/directory/bottin/config.json b/app/config/configuration/directory/bottin/config.json
index c30a4d5..7867ff0 100644
--- a/app/config/configuration/directory/bottin/config.json
+++ b/app/config/configuration/directory/bottin/config.json
@@ -1,6 +1,6 @@
 {
   "suffix": "dc=deuxfleurs,dc=fr",
-  "bind": "0.0.0.0:1389",
+  "bind": "0.0.0.0:389",
   "consul_host": "http://consul.service.2.cluster.deuxfleurs.fr:8500",
   "log_level": "debug",
   "acl": [
diff --git a/app/deployment/bottin2.hcl b/app/deployment/bottin2.hcl
index 85bda59..56b701a 100644
--- a/app/deployment/bottin2.hcl
+++ b/app/deployment/bottin2.hcl
@@ -13,9 +13,10 @@ job "directory2" {
       driver = "docker"
       config {
         image = "lxpz/bottin_amd64:14"
+        network_mode = "host"
         readonly_rootfs = true
         port_map {
-          ldap_port = 1389
+          ldap_port = 389
         }
         volumes = [
           "secrets/config.json:/config.json"
diff --git a/app/deployment/postgres.hcl b/app/deployment/postgres.hcl
index 456156e..d178491 100644
--- a/app/deployment/postgres.hcl
+++ b/app/deployment/postgres.hcl
@@ -5,7 +5,7 @@ job "postgres" {
 
   update {
     max_parallel     = 1
-    stagger = "5m"
+    stagger = "2m"
   }
 
   group "postgres" {
@@ -14,6 +14,7 @@ job "postgres" {
 
       config {
         image = "superboum/amd64_postgres:v3"
+        network_mode = "host" 
         readonly_rootfs = false
         command = "/usr/local/bin/stolon-sentinel"
         args = [
@@ -32,6 +33,7 @@ job "postgres" {
 
       config {
         image = "superboum/amd64_postgres:v3"
+        network_mode = "host" 
         readonly_rootfs = false
         command = "/usr/local/bin/stolon-proxy"
         args = [
@@ -78,8 +80,8 @@ job "postgres" {
       driver = "docker"
 
       config {
-        network_mode = "host" 
         image = "superboum/amd64_postgres:v3"
+        network_mode = "host" 
         readonly_rootfs = false
         command = "/usr/local/bin/stolon-keeper"
         args = [