diff options
Diffstat (limited to 'modules/private/websites/tools/diaspora')
-rw-r--r-- | modules/private/websites/tools/diaspora/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/private/websites/tools/diaspora/default.nix b/modules/private/websites/tools/diaspora/default.nix index 20ae055..4fe4115 100644 --- a/modules/private/websites/tools/diaspora/default.nix +++ b/modules/private/websites/tools/diaspora/default.nix | |||
@@ -1,6 +1,6 @@ | |||
1 | { lib, pkgs, config, myconfig, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | env = myconfig.env.tools.diaspora; | 3 | env = config.myEnv.tools.diaspora; |
4 | root = "/run/current-system/webapps/tools_diaspora"; | 4 | root = "/run/current-system/webapps/tools_diaspora"; |
5 | cfg = config.myServices.websites.tools.diaspora; | 5 | cfg = config.myServices.websites.tools.diaspora; |
6 | dcfg = config.services.diaspora; | 6 | dcfg = config.services.diaspora; |
@@ -26,7 +26,7 @@ in { | |||
26 | environment: | 26 | environment: |
27 | url: "https://diaspora.immae.eu/" | 27 | url: "https://diaspora.immae.eu/" |
28 | certificate_authorities: '${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt' | 28 | certificate_authorities: '${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt' |
29 | redis: '${env.redis_url}' | 29 | redis: 'redis://${env.redis.host}:${env.redis.port}/${env.redis.db}' |
30 | sidekiq: | 30 | sidekiq: |
31 | s3: | 31 | s3: |
32 | assets: | 32 | assets: |
@@ -79,16 +79,16 @@ in { | |||
79 | inbound: | 79 | inbound: |
80 | ldap: | 80 | ldap: |
81 | enable: true | 81 | enable: true |
82 | host: ldap.immae.eu | 82 | host: ${env.ldap.host} |
83 | port: 636 | 83 | port: 636 |
84 | only_ldap: true | 84 | only_ldap: true |
85 | mail_attribute: mail | 85 | mail_attribute: mail |
86 | skip_email_confirmation: true | 86 | skip_email_confirmation: true |
87 | use_bind_dn: true | 87 | use_bind_dn: true |
88 | bind_dn: "cn=diaspora,ou=services,dc=immae,dc=eu" | 88 | bind_dn: "${env.ldap.dn}" |
89 | bind_pw: "${env.ldap.password}" | 89 | bind_pw: "${env.ldap.password}" |
90 | search_base: "dc=immae,dc=eu" | 90 | search_base: "${env.ldap.base}" |
91 | search_filter: "(&(memberOf=cn=users,cn=diaspora,ou=services,dc=immae,dc=eu)(uid=%{username}))" | 91 | search_filter: "${env.ldap.filter}" |
92 | production: | 92 | production: |
93 | environment: | 93 | environment: |
94 | development: | 94 | development: |