Ajout du mecanisme d'invitation de Guichet

3 files changed, 45 insertions, 18 deletions

diff --git a/consul/configuration/directory/bottin/config.json b/consul/configuration/directory/bottin/config.json
index 93d95c9..37b5236 100644
--- a/consul/configuration/directory/bottin/config.json
+++ b/consul/configuration/directory/bottin/config.json
@@ -6,10 +6,23 @@
   "acl": [
 		"*,dc=deuxfleurs,dc=fr::read:*:* !userpassword",
 		"*::read modify:SELF:*",
-		"cn=admin,dc=deuxfleurs,dc=fr::read add modify delete:*:*",
-		"*:cn=admin,ou=groups,dc=deuxfleurs,dc=fr:read add modify delete:*:*",
 		"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::bind:*,ou=users,dc=deuxfleurs,dc=fr:*",
+
+		"*: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=admin,dc=deuxfleurs,dc=fr::read add modify delete:*:*",
+		"*:cn=admin,ou=groups,dc=deuxfleurs,dc=fr:read add modify delete:*:*"
   ]
 }
diff --git a/consul/configuration/directory/guichet/config.json b/consul/configuration/directory/guichet/config.json
deleted file mode 100644
index 9dde56a..0000000
--- a/consul/configuration/directory/guichet/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "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/directory/guichet/config.json.tpl b/consul/configuration/directory/guichet/config.json.tpl
new file mode 100644
index 0000000..ce34f98
--- /dev/null
+++ b/consul/configuration/directory/guichet/config.json.tpl
@@ -0,0 +1,29 @@
+{
+  "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",
+
+  "invitation_base_dn": "ou=invitations,dc=deuxfleurs,dc=fr",
+  "invitation_name_attr": "cn",
+  "invited_mail_format": "{}@deuxfleurs.fr",
+  "invited_auto_groups": [
+    "cn=email,ou=groups,dc=deuxfleurs,dc=fr",
+    "cn=seafile,ou=groups,dc=deuxfleurs,dc=fr"
+  ],
+
+  "web_address": "https://guichet.deuxfleurs.fr",
+  "mail_from": "coucou@deuxfleurs.fr",
+  "smtp_server": "adnab.me:25",
+  "smtp_username": "{{ key "secrets/directory/guichet/smtp_user" | trimSpace }}",
+  "smtp_password": "{{ key "secrets/directory/guichet/smtp_pass" | trimSpace }}",
+
+  "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"
+}
+