From e4c15e9d7143f452f05ff469112234a16e341051 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 19 Oct 2020 20:07:15 +0200
Subject: Plume integration is working

---
 app/build/docker-compose.yml             |  2 +-
 app/integration/plume/bottin.json        | 31 +++++++++++++++++++++++++++++++
 app/integration/plume/docker-compose.yml | 13 +++++++++++++
 app/integration/plume/plume.env          |  6 ++++++
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 app/integration/plume/bottin.json

(limited to 'app')

diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml
index 1ca740a..ee76372 100644
--- a/app/build/docker-compose.yml
+++ b/app/build/docker-compose.yml
@@ -66,5 +66,5 @@ services:
     build:
       context: ./plume
       args:
-        VERSION: 003dcf861a9f55720b03d52f2f95f5f59e338809
+        VERSION: 0cd26dfbf4ab7be467325ed77230cf371147a98e
     image: superboum/plume:v1
diff --git a/app/integration/plume/bottin.json b/app/integration/plume/bottin.json
new file mode 100644
index 0000000..a970762
--- /dev/null
+++ b/app/integration/plume/bottin.json
@@ -0,0 +1,31 @@
+{
+  "suffix": "dc=deuxfleurs,dc=fr",
+  "bind": "0.0.0.0:389",
+  "consul_host": "http://consul:8500",
+  "log_level": "debug",
+  "acl": [
+		"*,dc=deuxfleurs,dc=fr::read:*:* !userpassword",
+		"*::read modify:SELF:*",
+		"ANONYMOUS::bind:*,ou=users,dc=deuxfleurs,dc=fr:",
+		"ANONYMOUS::bind:cn=admin,dc=deuxfleurs,dc=fr:",
+		"*,ou=services,ou=users,dc=deuxfleurs,dc=fr::bind:*,ou=users,dc=deuxfleurs,dc=fr:*",
+		"*,ou=services,ou=users,dc=deuxfleurs,dc=fr::read:*:*",
+
+		"*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:add:*,ou=invitations,dc=deuxfleurs,dc=fr:*",
+		"ANONYMOUS::bind:*,ou=invitations,dc=deuxfleurs,dc=fr:",
+		"*,ou=invitations,dc=deuxfleurs,dc=fr::delete:SELF:*",
+
+		"*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:add:*,ou=users,dc=deuxfleurs,dc=fr:*",
+		"*,ou=invitations,dc=deuxfleurs,dc=fr::add:*,ou=users,dc=deuxfleurs,dc=fr:*",
+
+		"*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:modifyAdd:cn=email,ou=groups,dc=deuxfleurs,dc=fr:*",
+		"*,ou=invitations,dc=deuxfleurs,dc=fr::modifyAdd:cn=email,ou=groups,dc=deuxfleurs,dc=fr:*",
+		"*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:modifyAdd:cn=seafile,ou=groups,dc=deuxfleurs,dc=fr:*",
+		"*,ou=invitations,dc=deuxfleurs,dc=fr::modifyAdd:cn=seafile,ou=groups,dc=deuxfleurs,dc=fr:*",
+		"*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:modifyAdd:cn=nextcloud,ou=groups,dc=deuxfleurs,dc=fr:*",
+		"*,ou=invitations,dc=deuxfleurs,dc=fr::modifyAdd:cn=seafile,ou=nextcloud,dc=deuxfleurs,dc=fr:*",
+
+		"cn=admin,dc=deuxfleurs,dc=fr::read add modify delete:*:*",
+		"*:cn=admin,ou=groups,dc=deuxfleurs,dc=fr:read add modify delete:*:*"
+  ]
+}
diff --git a/app/integration/plume/docker-compose.yml b/app/integration/plume/docker-compose.yml
index 2ec8371..b88de8a 100644
--- a/app/integration/plume/docker-compose.yml
+++ b/app/integration/plume/docker-compose.yml
@@ -4,6 +4,9 @@ services:
     image: superboum/plume:v1
     env_file:
       - plume.env
+    depends_on:
+      - consul
+      - postgres
     ports:
       - "7878:7878"
 
@@ -13,3 +16,13 @@ services:
       - POSTGRES_DB=plume
       - POSTGRES_USER=plume
       - POSTGRES_PASSWORD=plume
+
+  bottin:
+    image: lxpz/bottin_amd64:14
+    depends_on:
+      - consul
+    volumes:
+      - ./bottin.json:/config.json
+
+  consul:
+    image: consul:1.8.4
diff --git a/app/integration/plume/plume.env b/app/integration/plume/plume.env
index 0db538f..88c62dc 100644
--- a/app/integration/plume/plume.env
+++ b/app/integration/plume/plume.env
@@ -23,3 +23,9 @@ MEDIA_UPLOAD_DIRECTORY=/app/static/media
 SEARCH_INDEX=/app/search_index
 DOMAIN_NAME="integration.env"
 INSTANCE_NAME="Integration Instance"
+
+LDAP_ADDR=ldap://bottin:389
+LDAP_BASE_DN=ou=users,dc=deuxfleurs,dc=fr
+LDAP_USER_NAME_ATTR=cn
+LDAP_USER_MAIL_ATTR=mail
+LDAP_TLS=false
-- 
cgit v1.2.3