diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-12-25 22:12:38 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-12-25 22:12:38 +0100 |
| commit | 6d6e48c8fa7f4f38a5b812389d269c025a977790 (patch) | |
| tree | 885bc84d852c0504ecbdf6e2179d3b4ff7d4025c /cluster/staging | |
| parent | 8d0a7a806da952adccca51b0a806a4c28732ea90 (diff) | |
| download | nixcfg-6d6e48c8fa7f4f38a5b812389d269c025a977790.tar.gz nixcfg-6d6e48c8fa7f4f38a5b812389d269c025a977790.zip | |
Improve secretmgr more, update secrets for staging
Diffstat (limited to 'cluster/staging')
| -rw-r--r-- | cluster/staging/app/directory/secrets.toml | 9 | ||||
| -rw-r--r-- | cluster/staging/secretmgr.toml | 12 |
2 files changed, 17 insertions, 4 deletions
diff --git a/cluster/staging/app/directory/secrets.toml b/cluster/staging/app/directory/secrets.toml index 0ebd77f..edde6cc 100644 --- a/cluster/staging/app/directory/secrets.toml +++ b/cluster/staging/app/directory/secrets.toml @@ -1,6 +1,7 @@ [secrets."directory/ldap_base_dn"] type = 'user' -description = 'LDAP base DN for everything (e.g. dc=example,dc=com)' +description = 'LDAP base DN for everything' +example = 'dc=example,dc=com' [secrets."directory/guichet/smtp_user"] type = 'user' @@ -24,7 +25,8 @@ description = 'SMTP password' [secrets."directory/guichet/web_hostname"] type = 'user' -description = 'Public hostname from which Guichet is accessible via HTTP (e.g. guichet.example.com)' +description = 'Public hostname from which Guichet is accessible via HTTP' +example = 'guichet.example.com' [secrets."directory/guichet/s3_bucket"] type = 'user' @@ -44,5 +46,6 @@ description = 'E-mail address from which to send welcome emails to new users' [secrets."directory/guichet/mail_domain"] type = 'user' -description = 'E-mail domain for new users (e.g. example.com)' +description = 'E-mail domain for new users' +example = 'example.com' diff --git a/cluster/staging/secretmgr.toml b/cluster/staging/secretmgr.toml index cbaa6f6..9dc0aa5 100644 --- a/cluster/staging/secretmgr.toml +++ b/cluster/staging/secretmgr.toml @@ -4,6 +4,16 @@ service_dn_suffix = "ou=services,ou=users,dc=staging,dc=deuxfleurs,dc=org" admin_dn = "cn=admin,dc=staging,dc=deuxfleurs,dc=org" admin_password_secret = "directory/admin_password" -[constants] +[user_values] +"directory/ldap_base_dn" = "dc=staging,dc=deuxfleurs,dc=org" +"directory/guichet/mail_domain" = "staging.deuxfleurs.org" +"directory/guichet/mail_from" = "contact@deuxfleurs.org" +"directory/guichet/s3_bucket" = "bottin-pictures" +"directory/guichet/s3_endpoint" = "garage.staging.deuxfleurs.org" +"directory/guichet/s3_region" = "garage-staging" +"directory/guichet/smtp_server" = "mail.gandi.net:25" +"directory/guichet/smtp_user" = "contact@deuxfleurs.org" +"directory/guichet/web_hostname" = "guichet.staging.deuxfleurs.org" + "dummy/public_domain" = "dummy.staging.deuxfleurs.org" "dummy/test_constant" = "test value" |