Merge branch 'guichet' of Deuxfleurs/deuxfleurs.fr into master

This commit is contained in:
Alex 2020-02-11 09:11:26 +01:00 committed by Gitea
commit 1c7b89e548
4 changed files with 73 additions and 4 deletions

View file

@ -25,3 +25,5 @@
!email/sogo/sogo.conf.tpl !email/sogo/sogo.conf.tpl
!chat/**/* !chat/**/*
!directory/*/*

View file

@ -0,0 +1,15 @@
{
"http_bind_addr": ":9991",
"ldap_server_addr": "ldap://bottin2.service.2.cluster.deuxfleurs.fr:389",
"base_dn": "dc=deuxfleurs,dc=fr",
"user_base_dn": "ou=users,dc=deuxfleurs,dc=fr",
"user_name_attr": "cn",
"group_base_dn": "ou=groups,dc=deuxfleurs,dc=fr",
"group_name_attr": "cn",
"admin_account": "cn=admin,dc=deuxfleurs,dc=fr",
"group_can_admin": "cn=admin,ou=groups,dc=deuxfleurs,dc=fr",
"group_can_invite": "cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr"
}

View file

@ -7,12 +7,12 @@ job "directory2" {
value = "amd64" value = "amd64"
} }
group "ldap" { group "bottin" {
count = 1 count = 1
task "server" { task "bottin" {
driver = "docker" driver = "docker"
config { config {
image = "lxpz/bottin_amd64:6" image = "lxpz/bottin_amd64:8"
readonly_rootfs = true readonly_rootfs = true
port_map { port_map {
ldap_port = 1389 ldap_port = 1389
@ -32,7 +32,7 @@ job "directory2" {
} }
template { template {
data = "{{ key \"configuration/bottin/config.json\" }}" data = "{{ key \"configuration/directory/bottin/config.json\" }}"
destination = "secrets/config.json" destination = "secrets/config.json"
} }
@ -55,5 +55,57 @@ job "directory2" {
} }
} }
} }
group "guichet" {
count = 1
task "guichet" {
driver = "docker"
config {
image = "lxpz/guichet_amd64:1"
readonly_rootfs = true
port_map {
web_port = 9991
}
volumes = [
"secrets/config.json:/config.json"
]
}
template {
data = "{{ key \"configuration/directory/guichet/config.json\" }}"
destination = "secrets/config.json"
}
resources {
memory = 100
network {
port "web_port" {}
}
}
service {
name = "guichet"
tags = [
"guichet",
"traefik.enable=true",
"traefik.frontend.entryPoints=https,http",
"traefik.frontend.rule=Host:guichet.deuxfleurs.fr,guichet.deuxfleurs.org",
]
port = "web_port"
address_mode = "host"
check {
type = "tcp"
port = "web_port"
interval = "60s"
timeout = "5s"
check_restart {
limit = 3
grace = "90s"
ignore_warnings = false
}
}
}
}
}
} }