aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-02-11 22:21:40 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-02-11 22:21:40 +0100
commite700d146f032a824f1735ab31a28e2ac0f374629 (patch)
tree8208e1d6dc421afa3646b19641d7215471593046
parent3feb426e9f2a1ed790eb3932d81cb959bafc91d5 (diff)
parent44a341f9a69e8d6ca2b9f4e4f8574d8d89668119 (diff)
downloadinfrastructure-e700d146f032a824f1735ab31a28e2ac0f374629.tar.gz
infrastructure-e700d146f032a824f1735ab31a28e2ac0f374629.zip
Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr
Diffstat
-rw-r--r--consul/configuration/.gitignore2
-rw-r--r--consul/configuration/directory/bottin/config.json (renamed from consul/configuration/bottin/config.json)1
-rw-r--r--consul/configuration/directory/guichet/config.json15
-rw-r--r--consul/configuration/mariadb/main/env.tpl2
-rw-r--r--consul/configuration/seafile/conf/ccnet.conf.sample2
-rw-r--r--docker/landing/html/landing/prototype.html46
-rw-r--r--nomad/bottin2.hcl60
-rw-r--r--nomad/email.hcl4
8 files changed, 124 insertions, 8 deletions
diff --git a/consul/configuration/.gitignore b/consul/configuration/.gitignore
index bc3a54e..8c55cc6 100644
--- a/consul/configuration/.gitignore
+++ b/consul/configuration/.gitignore
@@ -25,3 +25,5 @@
!email/sogo/sogo.conf.tpl
!chat/**/*
+
+!directory/*/*
diff --git a/consul/configuration/bottin/config.json b/consul/configuration/directory/bottin/config.json
index 3cd5e9d..ca49922 100644
--- a/consul/configuration/bottin/config.json
+++ b/consul/configuration/directory/bottin/config.json
@@ -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:*",
diff --git a/consul/configuration/directory/guichet/config.json b/consul/configuration/directory/guichet/config.json
new file mode 100644
index 0000000..9dde56a
--- /dev/null
+++ b/consul/configuration/directory/guichet/config.json
@@ -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"
+}
+
diff --git a/consul/configuration/mariadb/main/env.tpl b/consul/configuration/mariadb/main/env.tpl
index 5ac1b19..0fe903b 100644
--- a/consul/configuration/mariadb/main/env.tpl
+++ b/consul/configuration/mariadb/main/env.tpl
@@ -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 }}"
diff --git a/consul/configuration/seafile/conf/ccnet.conf.sample b/consul/configuration/seafile/conf/ccnet.conf.sample
index 0c93bef..76f4da9 100644
--- a/consul/configuration/seafile/conf/ccnet.conf.sample
+++ b/consul/configuration/seafile/conf/ccnet.conf.sample
@@ -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
diff --git a/docker/landing/html/landing/prototype.html b/docker/landing/html/landing/prototype.html
new file mode 100644
index 0000000..32345a1
--- /dev/null
+++ b/docker/landing/html/landing/prototype.html
@@ -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>
diff --git a/nomad/bottin2.hcl b/nomad/bottin2.hcl
index 8c02078..da315de 100644
--- a/nomad/bottin2.hcl
+++ b/nomad/bottin2.hcl
@@ -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
+ }
+ }
+ }
+ }
+ }
}
diff --git a/nomad/email.hcl b/nomad/email.hcl
index 17ae613..1d5c8c1 100644
--- a/nomad/email.hcl
+++ b/nomad/email.hcl
@@ -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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-19 23:52:35 +0000