Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr
This commit is contained in:
commit
e700d146f0
8 changed files with 124 additions and 8 deletions
2
consul/configuration/.gitignore
vendored
2
consul/configuration/.gitignore
vendored
|
|
@ -25,3 +25,5 @@
|
|||
!email/sogo/sogo.conf.tpl
|
||||
|
||||
!chat/**/*
|
||||
|
||||
!directory/*/*
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
"suffix": "dc=deuxfleurs,dc=fr",
|
||||
"bind": "0.0.0.0:1389",
|
||||
"consul_host": "http://consul.service.2.cluster.deuxfleurs.fr:8500",
|
||||
"log_level": "debug",
|
||||
"acl": [
|
||||
"*,dc=deuxfleurs,dc=fr::read:*:* !userpassword",
|
||||
"*::read modify:SELF:*",
|
||||
15
consul/configuration/directory/guichet/config.json
Normal file
15
consul/configuration/directory/guichet/config.json
Normal 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"
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
LDAP_URI = "ldap://bottin.service.2.cluster.deuxfleurs.fr"
|
||||
LDAP_URI = "ldap://bottin2.service.2.cluster.deuxfleurs.fr"
|
||||
LDAP_BASE = "ou=users,dc=deuxfleurs,dc=fr"
|
||||
LDAP_VERSION = 3
|
||||
LDAP_BIND_DN = "{{ key "secrets/mariadb/main/ldap_binddn" | trimSpace }}"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ PORT = 10001
|
|||
PORT = 13418
|
||||
|
||||
[LDAP]
|
||||
HOST = ldap://bottin.service.2.cluster.deuxfleurs.fr/
|
||||
HOST = ldap://bottin2.service.2.cluster.deuxfleurs.fr/
|
||||
BASE = ou=users,dc=deuxfleurs,dc=fr
|
||||
USER_DN = cn=<to be defined>,dc=deuxfleurs,dc=fr
|
||||
FILTER = memberOf=CN=seafile,OU=groups,DC=deuxfleurs,DC=fr
|
||||
|
|
|
|||
46
docker/landing/html/landing/prototype.html
Normal file
46
docker/landing/html/landing/prototype.html
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<title>deuxfleurs</title>
|
||||
<meta charset="utf-8"/>
|
||||
<style>
|
||||
* {
|
||||
font-family: Helvetica;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
header {
|
||||
background-color: #519c60;
|
||||
color: #ffffff;
|
||||
padding: 50px 40px 1px 40px;
|
||||
}
|
||||
|
||||
header > h1 {
|
||||
font-size: 80px;
|
||||
margin: 10px 0px -31px 0px;
|
||||
}
|
||||
|
||||
header > .site-name > img, header > .site-name > span {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
header > .site-name > span {
|
||||
font-size: 30px;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<header>
|
||||
<!-- <div class="site-name">
|
||||
<img src="1f4ae.svg" width="32">
|
||||
<img src="1f4ae.svg" width="32">
|
||||
<span>deuxfleurs<span>
|
||||
</div> -->
|
||||
<h1>documentation</h1>
|
||||
</header>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -7,12 +7,12 @@ job "directory2" {
|
|||
value = "amd64"
|
||||
}
|
||||
|
||||
group "ldap" {
|
||||
group "bottin" {
|
||||
count = 1
|
||||
task "server" {
|
||||
task "bottin" {
|
||||
driver = "docker"
|
||||
config {
|
||||
image = "lxpz/bottin_amd64:1"
|
||||
image = "lxpz/bottin_amd64:8"
|
||||
readonly_rootfs = true
|
||||
port_map {
|
||||
ldap_port = 1389
|
||||
|
|
@ -32,7 +32,7 @@ job "directory2" {
|
|||
}
|
||||
|
||||
template {
|
||||
data = "{{ key \"configuration/bottin/config.json\" }}"
|
||||
data = "{{ key \"configuration/directory/bottin/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:2"
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -416,8 +416,8 @@ job "email" {
|
|||
tags = [
|
||||
"sogo",
|
||||
"traefik.enable=true",
|
||||
"traefik.frontend.entryPoints=https",
|
||||
"traefik.frontend.rule=Host:sogo.deuxfleurs.fr;PathPrefix:/"
|
||||
"traefik.frontend.entryPoints=https,http",
|
||||
"traefik.frontend.rule=Host:www.sogo.deuxfleurs.fr,sogo.deuxfleurs.fr;PathPrefix:/"
|
||||
]
|
||||
check {
|
||||
type = "tcp"
|
||||
|
|
|
|||
Reference in a new issue