aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-10-27 23:25:30 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-10-27 23:25:30 +0100
commitf4a88fa5659ca658643d3ff07acf9723104d181b (patch)
tree9779f99949eb57bc3d5b37fa924be21df84a55dd
parent2557793cee67469c1871fd384c6c094006a64aa6 (diff)
downloadinfrastructure-f4a88fa5659ca658643d3ff07acf9723104d181b.tar.gz
infrastructure-f4a88fa5659ca658643d3ff07acf9723104d181b.zip
Docker does not use IPv6, switching to "network=host"
-rw-r--r--app/config/configuration/directory/bottin/config.json2
-rw-r--r--app/deployment/bottin2.hcl3
-rw-r--r--app/deployment/postgres.hcl6
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 = [