From 6ea18bf8aec02e8d48dea48b98900cdfa2349f2d Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 24 Aug 2022 16:03:52 +0200 Subject: Add directory config for prod --- .../app/directory/config/bottin/config.json.tpl | 26 ++++ .../app/directory/config/guichet/config.json.tpl | 34 +++++ cluster/prod/app/directory/deploy/directory.hcl | 140 +++++++++++++++++++++ .../secrets/directory/guichet/mail_domain | 1 + .../directory/secrets/directory/guichet/mail_from | 1 + .../secrets/directory/guichet/s3_access_key | 1 + .../directory/secrets/directory/guichet/s3_bucket | 1 + .../secrets/directory/guichet/s3_endpoint | 1 + .../directory/secrets/directory/guichet/s3_region | 1 + .../secrets/directory/guichet/s3_secret_key | 1 + .../directory/secrets/directory/guichet/smtp_pass | 1 + .../secrets/directory/guichet/smtp_server | 1 + .../directory/secrets/directory/guichet/smtp_user | 1 + .../secrets/directory/guichet/web_hostname | 1 + .../app/directory/secrets/directory/ldap_base_dn | 1 + 15 files changed, 212 insertions(+) create mode 100644 cluster/prod/app/directory/config/bottin/config.json.tpl create mode 100644 cluster/prod/app/directory/config/guichet/config.json.tpl create mode 100644 cluster/prod/app/directory/deploy/directory.hcl create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/mail_domain create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/mail_from create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/s3_access_key create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/s3_bucket create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/s3_endpoint create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/s3_region create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/s3_secret_key create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/smtp_pass create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/smtp_server create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/smtp_user create mode 100644 cluster/prod/app/directory/secrets/directory/guichet/web_hostname create mode 100644 cluster/prod/app/directory/secrets/directory/ldap_base_dn diff --git a/cluster/prod/app/directory/config/bottin/config.json.tpl b/cluster/prod/app/directory/config/bottin/config.json.tpl new file mode 100644 index 0000000..844f7b7 --- /dev/null +++ b/cluster/prod/app/directory/config/bottin/config.json.tpl @@ -0,0 +1,26 @@ +{ + "suffix": "{{ key "secrets/directory/ldap_base_dn" }}", + "bind": "0.0.0.0:389", + "log_level": "debug", + "acl": [ + "*,{{ key "secrets/directory/ldap_base_dn" }}::read:*:* !userpassword !user_secret !alternate_user_secrets !garage_s3_secret_key", + "*::read modify:SELF:*", + "ANONYMOUS::bind:*,ou=users,{{ key "secrets/directory/ldap_base_dn" }}:", + "ANONYMOUS::bind:cn=admin,{{ key "secrets/directory/ldap_base_dn" }}:", + "*,ou=services,ou=users,{{ key "secrets/directory/ldap_base_dn" }}::bind:*,ou=users,{{ key "secrets/directory/ldap_base_dn" }}:*", + "*,ou=services,ou=users,{{ key "secrets/directory/ldap_base_dn" }}::read:*:*", + + "*:cn=asso_deuxfleurs,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}:add:*,ou=invitations,{{ key "secrets/directory/ldap_base_dn" }}:*", + "ANONYMOUS::bind:*,ou=invitations,{{ key "secrets/directory/ldap_base_dn" }}:", + "*,ou=invitations,{{ key "secrets/directory/ldap_base_dn" }}::delete:SELF:*", + + "*:cn=asso_deuxfleurs,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}:add:*,ou=users,{{ key "secrets/directory/ldap_base_dn" }}:*", + "*,ou=invitations,{{ key "secrets/directory/ldap_base_dn" }}::add:*,ou=users,{{ key "secrets/directory/ldap_base_dn" }}:*", + + "*:cn=asso_deuxfleurs,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}:modifyAdd:cn=email,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}:*", + "*,ou=invitations,{{ key "secrets/directory/ldap_base_dn" }}::modifyAdd:cn=email,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}:*", + + "cn=admin,{{ key "secrets/directory/ldap_base_dn" }}::read add modify delete:*:*", + "*:cn=admin,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}:read add modify delete:*:*" + ] +} diff --git a/cluster/prod/app/directory/config/guichet/config.json.tpl b/cluster/prod/app/directory/config/guichet/config.json.tpl new file mode 100644 index 0000000..1a843a8 --- /dev/null +++ b/cluster/prod/app/directory/config/guichet/config.json.tpl @@ -0,0 +1,34 @@ +{ + "http_bind_addr": ":9991", + "ldap_server_addr": "ldap://bottin.service.staging.consul:389", + + "base_dn": "{{ key "secrets/directory/ldap_base_dn" }}", + "user_base_dn": "ou=users,{{ key "secrets/directory/ldap_base_dn" }}", + "user_name_attr": "cn", + "group_base_dn": "ou=groups,{{ key "secrets/directory/ldap_base_dn" }}", + "group_name_attr": "cn", + + "invitation_base_dn": "ou=invitations,{{ key "secrets/directory/ldap_base_dn" }}", + "invitation_name_attr": "cn", + "invited_mail_format": "{}@{{ key "secrets/directory/guichet/mail_domain" | trimSpace }}", + "invited_auto_groups": [ + "cn=email,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}" + ], + + "web_address": "https://{{ key "secrets/directory/guichet/web_hostname" }}", + "mail_from": "{{ key "secrets/directory/guichet/mail_from" }}", + "smtp_server": "{{ key "secrets/directory/guichet/smtp_server" }}", + "smtp_username": "{{ key "secrets/directory/guichet/smtp_user" | trimSpace }}", + "smtp_password": "{{ key "secrets/directory/guichet/smtp_pass" | trimSpace }}", + + "admin_account": "cn=admin,{{ key "secrets/directory/ldap_base_dn" }}", + "group_can_admin": "cn=admin,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}", + "group_can_invite": "cn=asso_deuxfleurs,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}", + + "s3_endpoint": "{{ key "secrets/directory/guichet/s3_endpoint" }}", + "s3_access_key": "{{ key "secrets/directory/guichet/s3_access_key" | trimSpace }}", + "s3_secret_key": "{{ key "secrets/directory/guichet/s3_secret_key" | trimSpace }}", + "s3_region": "{{ key "secrets/directory/guichet/s3_region" }}", + "s3_bucket": "{{ key "secrets/directory/guichet/s3_bucket" }}" +} + diff --git a/cluster/prod/app/directory/deploy/directory.hcl b/cluster/prod/app/directory/deploy/directory.hcl new file mode 100644 index 0000000..89f5ebc --- /dev/null +++ b/cluster/prod/app/directory/deploy/directory.hcl @@ -0,0 +1,140 @@ +job "directory" { + datacenters = ["dc1", "neptune"] + type = "service" + priority = 90 + + constraint { + attribute = "${attr.cpu.arch}" + value = "amd64" + } + + group "bottin" { + count = 1 + + network { + port "ldap_port" { + static = 389 + to = 389 + } + } + + task "bottin" { + driver = "docker" + config { + image = "superboum/bottin_amd64:22" + network_mode = "host" + readonly_rootfs = true + ports = [ "ldap_port" ] + volumes = [ + "secrets/config.json:/config.json", + "secrets:/etc/bottin", + ] + } + + resources { + memory = 100 + } + + template { + data = file("../config/bottin/config.json.tpl") + destination = "secrets/config.json" + } + + template { + data = "{{ key \"secrets/consul/consul-ca.crt\" }}" + destination = "secrets/consul-ca.crt" + } + + template { + data = "{{ key \"secrets/consul/consul-client.crt\" }}" + destination = "secrets/consul-client.crt" + } + + template { + data = "{{ key \"secrets/consul/consul-client.key\" }}" + destination = "secrets/consul-client.key" + } + + template { + data = <