diff options
| -rw-r--r-- | consul/configuration/nextcloud/config.php.tpl | 1 | ||||
| -rw-r--r-- | nomad/bottin2.hcl | 2 | ||||
| -rw-r--r-- | nomad/nextcloud.hcl | 2 | ||||
| -rw-r--r-- | nomad/postgres.hcl | 4 | ||||
| -rw-r--r-- | nomad/traefik-netv2.hcl | 77 |
5 files changed, 82 insertions, 4 deletions
diff --git a/consul/configuration/nextcloud/config.php.tpl b/consul/configuration/nextcloud/config.php.tpl index 7dcfc6e..7c73187 100644 --- a/consul/configuration/nextcloud/config.php.tpl +++ b/consul/configuration/nextcloud/config.php.tpl @@ -6,6 +6,7 @@ $CONFIG = array ( 'secret' => '{{ key "secrets/nextcloud/secret" | trimSpace }}', 'trusted_domains' => array ( 0 => 'nextcloud.deuxfleurs.fr', + 1 => 'nextcloud.devx.adnab.me', ), 'memcache.local' => '\\OC\\Memcache\\APCu', diff --git a/nomad/bottin2.hcl b/nomad/bottin2.hcl index 05b5cf9..65d45c2 100644 --- a/nomad/bottin2.hcl +++ b/nomad/bottin2.hcl @@ -94,7 +94,7 @@ job "directory2" { "guichet", "traefik.enable=true", "traefik.frontend.entryPoints=https,http", - "traefik.frontend.rule=Host:guichet.deuxfleurs.fr", + "traefik.frontend.rule=Host:guichet.devx.adnab.me", ] port = "web_port" address_mode = "host" diff --git a/nomad/nextcloud.hcl b/nomad/nextcloud.hcl index 2cc4f5f..a5f66c8 100644 --- a/nomad/nextcloud.hcl +++ b/nomad/nextcloud.hcl @@ -45,7 +45,7 @@ job "nextcloud" { "nextcloud", "traefik.enable=true", "traefik.frontend.entryPoints=https,http", - "traefik.frontend.rule=Host:nextcloud.deuxfleurs.fr", + "traefik.frontend.rule=Host:nextcloud.deuxfleurs.fr,nextcloud.devx.adnab.me", ] port = "web_port" address_mode = "host" diff --git a/nomad/postgres.hcl b/nomad/postgres.hcl index 456156e..8e7c221 100644 --- a/nomad/postgres.hcl +++ b/nomad/postgres.hcl @@ -1,5 +1,5 @@ job "postgres" { - datacenters = ["dc1"] + datacenters = ["dc1", "belair"] type = "system" priority = 90 @@ -113,7 +113,7 @@ job "postgres" { } resources { - memory = 500 + memory = 200 network { port "psql_port" { static = "5433" diff --git a/nomad/traefik-netv2.hcl b/nomad/traefik-netv2.hcl new file mode 100644 index 0000000..4bc33c1 --- /dev/null +++ b/nomad/traefik-netv2.hcl @@ -0,0 +1,77 @@ +job "frontend" { + datacenters = ["dc1", "saturne"] + type = "service" + + group "traefik" { + network { + mode = "bridge" + port "http" { + static = 80 + host_network = "public" + } + port "https" { + static = 443 + host_network = "public" + } + port "admin" { + static = 8082 + } + } + + task "server" { + driver = "docker" + + config { + image = "amd64/traefik:1.7.20" + readonly_rootfs = true + volumes = [ + "secrets/traefik.toml:/etc/traefik/traefik.toml", + ] + } + + resources { + memory = 265 + } + + template { + data = "{{ key \"configuration/traefik/traefik.toml\" }}" + destination = "secrets/traefik.toml" + } + } + + service { + tags = [ + "http", + "frontend", + "(diplonat (tcp_port 80))" + ] + port = "http" + name = "traefik" + } + + service { + tags = [ + "https", + "frontend", + "(diplonat (tcp_port 443))" + ] + port = "https" + name = "traefik" + + check { + type = "http" + protocol = "http" + port = "http" + path = "/" + interval = "60s" + timeout = "5s" + check_restart { + limit = 3 + grace = "90s" + ignore_warnings = false + } + } + } + } +} + |