diff options
| -rw-r--r-- | config.json.example | 25 | ||||
| -rw-r--r-- | integration/config/bottin.json | 14 | ||||
| -rw-r--r-- | integration/docker-compose.yml | 2 |
3 files changed, 20 insertions, 21 deletions
diff --git a/config.json.example b/config.json.example index 1760685..61c2a89 100644 --- a/config.json.example +++ b/config.json.example @@ -1,6 +1,6 @@ { - "http_bind_addr": ":9991", - "ldap_server_addr": "ldap://127.0.0.1:389", + "http_bind_addr": "[::]:9991", + "ldap_server_addr": "ldap://localhost:389", "base_dn": "dc=bottin,dc=eu", "user_base_dn": "ou=users,dc=bottin,dc=eu", @@ -10,28 +10,27 @@ "invitation_base_dn": "ou=invitations,dc=bottin,dc=eu", "invitation_name_attr": "cn", - "invited_mail_format": "{}@example.com", + "invited_mail_format": "{}@bottin.eu", "invited_auto_groups": [ "cn=email,ou=groups,dc=bottin,dc=eu" ], - "web_address": "http://guichet.localhost:9991", - "mail_from": "welcome@example.com", - "smtp_server": "smtp.example.com", + "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": "", + "group_can_admin": "cn=admin,ou=groups,dc=bottin,dc=eu", + "group_can_invite": "cn=admin,ou=groups,dc=bottin,dc=eu", "s3_admin_endpoint": "localhost:3903", - "s3_admin_token": "GlXP43PWH3LuvEGSNxKYzZCyUss8VqZmarBU+HUlrxw=", + "s3_admin_token": "<change me>", - "s3_endpoint": "localhost", - "s3_access_key": "", - "s3_secret_key": "", + "s3_endpoint": "localhost:3900", + "s3_access_key": "<change me>", + "s3_secret_key": "<change me>", "s3_region": "garage", "s3_bucket": "bottin-pictures" } - diff --git a/integration/config/bottin.json b/integration/config/bottin.json index 4b9f3d7..c68b63e 100644 --- a/integration/config/bottin.json +++ b/integration/config/bottin.json @@ -1,13 +1,13 @@ { - "suffix": "dc=bottin,dc=eu", - "bind": "bottin:389", - "consul_host": "consul:8500", - "acl": [ + "suffix": "dc=bottin,dc=eu", + "bind": "bottin:389", + "consul_host": "consul:8500", + "acl": [ "ANONYMOUS::bind:*,ou=users,dc=bottin,dc=eu:", "ANONYMOUS::bind:cn=admin,dc=bottin,dc=eu:", + "cn=admin,dc=bottin,dc=eu::bind read add modify delete:*:*", "*,dc=bottin,dc=eu::read:*:* !userpassword", - "cn=admin,dc=bottin,dc=eu::read add modify delete:*:*", - "*:cn=admin,ou=groups,dc=bottin,dc=eu:read add modify delete:*:*", + "*:cn=admin,ou=groups,dc=bottin,dc=eu:bind read add modify delete:*:*", "ANONYMOUS::bind:*,ou=invitations,dc=bottin,dc=eu:", "*,ou=invitations,dc=bottin,dc=eu::delete:SELF:*", @@ -15,5 +15,5 @@ "*,ou=invitations,dc=bottin,dc=eu::modifyAdd:cn=email,ou=groups,dc=bottin,dc=eu:*", "*::read modify:SELF:*" - ] + ] } diff --git a/integration/docker-compose.yml b/integration/docker-compose.yml index ec855db..e7af367 100644 --- a/integration/docker-compose.yml +++ b/integration/docker-compose.yml @@ -15,7 +15,7 @@ services: volumes: - "./config/bottin.json:/config.json" garage: - image: dxflrs/garage:v0.8.2 + image: dxflrs/garage:v0.9.1 ports: - "3900:3900" - "3902:3902" |