aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrien <adrien@luxeylab.net>2023-03-27 11:13:09 +0200
committerAdrien <adrien@luxeylab.net>2023-03-27 11:13:09 +0200
commit5fb0139a3fccde294ab35659ef839618400dcca2 (patch)
treeb04c8bcae650c91196beb90a92aa18566b2364b9
parent9eaa4c068ddc72eb2764b171918281cad62212b5 (diff)
downloadguichet-5fb0139a3fccde294ab35659ef839618400dcca2.tar.gz
guichet-5fb0139a3fccde294ab35659ef839618400dcca2.zip
bridged Guichet (built directly with Go) with the integration docker-composeintegration
-rw-r--r--.gitignore1
-rw-r--r--integration/README.md7
-rw-r--r--integration/config/guichet.json34
-rw-r--r--integration/docker-compose.yml6
4 files changed, 44 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index e1a6d79..3ff2a32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ guichet.static
config.json
result
.direnv/
+password
diff --git a/integration/README.md b/integration/README.md
index e8cc112..01cde3f 100644
--- a/integration/README.md
+++ b/integration/README.md
@@ -8,4 +8,9 @@ On ne met pas Guichet dans le `compose` pour pouvoir itérer plus rapidement : u
## Notes
-* Bien récupérer le password `admin` dans les logs de 1er lancement de Bottin : il ne sera pas réaffiché. \ No newline at end of file
+* Bien récupérer le password `admin` dans les logs de 1er lancement de Bottin : il ne sera pas réaffiché.
+* Identifiant de l'admin sur Guichet : `cn=admin,dc=bottin,dc=eu` because il n'est pas dans `ou=users,dc=bottin,dc=eu` qui est l'organisation par défaut dans laquelle on va chercher les utilisateurs.
+
+## TODO
+
+* Bridger Garage/S3 (pour le moment ne sert que pour les avatars dans l'annuaire) \ No newline at end of file
diff --git a/integration/config/guichet.json b/integration/config/guichet.json
new file mode 100644
index 0000000..8f6c20b
--- /dev/null
+++ b/integration/config/guichet.json
@@ -0,0 +1,34 @@
+{
+ "http_bind_addr": ":9991",
+ "ldap_server_addr": "ldap://127.0.0.1:389",
+
+ "base_dn": "dc=bottin,dc=eu",
+ "user_base_dn": "ou=users,dc=bottin,dc=eu",
+ "user_name_attr": "cn",
+ "group_base_dn": "ou=groups,dc=bottin,dc=eu",
+ "group_name_attr": "cn",
+
+ "invitation_base_dn": "ou=invitations,dc=bottin,dc=eu",
+ "invitation_name_attr": "cn",
+ "invited_mail_format": "{}@bottin.eu",
+ "invited_auto_groups": [
+ "cn=email,ou=groups,dc=bottin,dc=eu"
+ ],
+
+ "web_address": "https://guichet.bottin.eu",
+ "mail_from": "welcome@bottin.eu",
+ "smtp_server": "smtp.bottin.eu",
+ "smtp_username": "guichet",
+ "smtp_password": "",
+
+ "admin_account": "cn=admin,dc=bottin,dc=eu",
+ "group_can_admin": "gid=admin,ou=groups,dc=bottin,dc=eu",
+ "group_can_invite": "",
+
+ "s3_endpoint": "garage.bottin.eu",
+ "s3_access_key": "",
+ "s3_secret_key": "",
+ "s3_region": "garage",
+ "s3_bucket": "bottin-pictures"
+}
+
diff --git a/integration/docker-compose.yml b/integration/docker-compose.yml
index 5ed0650..6331737 100644
--- a/integration/docker-compose.yml
+++ b/integration/docker-compose.yml
@@ -4,13 +4,13 @@ services:
image: consul
restart: "always"
expose:
- - "8500"
+ - 8500
bottin:
image: dxflrs/bottin:dnp41vp8w24h4mbh0xg1mybzr1f46k41
command: "-config /etc/bottin.json"
restart: "always"
depends_on: ["consul"]
- expose:
- - 389
+ ports:
+ - "389:389"
volumes:
- "./config/bottin.json:/etc/bottin.json"