WIP NextCloud using Garage backend, fix app download urls

This commit is contained in:
Alex 2020-07-05 16:48:59 +02:00
parent 24118ab426
commit edb0a3737a
5 changed files with 82 additions and 4 deletions

View file

@ -6,6 +6,7 @@ $CONFIG = array (
'secret' => '{{ key "secrets/nextcloud/secret" | trimSpace }}', 'secret' => '{{ key "secrets/nextcloud/secret" | trimSpace }}',
'trusted_domains' => array ( 'trusted_domains' => array (
0 => 'nextcloud.deuxfleurs.fr', 0 => 'nextcloud.deuxfleurs.fr',
1 => 'nextcloud.devx.adnab.me',
), ),
'memcache.local' => '\\OC\\Memcache\\APCu', 'memcache.local' => '\\OC\\Memcache\\APCu',

View file

@ -94,7 +94,7 @@ job "directory2" {
"guichet", "guichet",
"traefik.enable=true", "traefik.enable=true",
"traefik.frontend.entryPoints=https,http", "traefik.frontend.entryPoints=https,http",
"traefik.frontend.rule=Host:guichet.deuxfleurs.fr", "traefik.frontend.rule=Host:guichet.devx.adnab.me",
] ]
port = "web_port" port = "web_port"
address_mode = "host" address_mode = "host"

View file

@ -45,7 +45,7 @@ job "nextcloud" {
"nextcloud", "nextcloud",
"traefik.enable=true", "traefik.enable=true",
"traefik.frontend.entryPoints=https,http", "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" port = "web_port"
address_mode = "host" address_mode = "host"

View file

@ -1,5 +1,5 @@
job "postgres" { job "postgres" {
datacenters = ["dc1"] datacenters = ["dc1", "belair"]
type = "system" type = "system"
priority = 90 priority = 90
@ -113,7 +113,7 @@ job "postgres" {
} }
resources { resources {
memory = 500 memory = 200
network { network {
port "psql_port" { port "psql_port" {
static = "5433" static = "5433"

77
nomad/traefik-netv2.hcl Normal file
View file

@ -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
}
}
}
}
}