wurzel/fruitbasket
9
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

matrix, nextcloud: pin domain to staging

Browse source
This commit is contained in:
Rouven Seifert 2023-09-15 13:04:24 +02:00
parent 4447cf06c4
commit b224f278c9
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
modules/matrix.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
domainServer = "matrix.${config.fsr.domain}"; domainServer = "matrix.staging.ifsr.de";
domainClient = "chat.${config.fsr.domain}"; domainClient = "chat.staging.ifsr.de";
clientConfig = { clientConfig = {
"m.homeserver" = { "m.homeserver" = {
@ -96,21 +96,22 @@ in
extraConfigFiles = [ extraConfigFiles = [
(pkgs.writeTextFile { (pkgs.writeTextFile {
name = "matrix-synapse-extra-config.yml"; name = "matrix-synapse-extra-config.yml";
text = let portunus = config.services.portunus; in '' text = let portunus = config.services.portunus; in
modules: ''
- module: ldap_auth_provider.LdapAuthProviderModule modules:
config: - module: ldap_auth_provider.LdapAuthProviderModule
enabled: true config:
uri: ldap://localhost enabled: true
base: ou=users,${portunus.ldap.suffix} uri: ldap://localhost
# taken from kaki config base: ou=users,${portunus.ldap.suffix}
attributes: # taken from kaki config
uid: uid attributes:
mail: uid uid: uid
name: cn mail: uid
bind_dn: uid=search,ou=users,${portunus.ldap.suffix} name: cn
bind_password_file: ${config.sops.secrets.matrix_ldap_search.path} bind_dn: uid=search,ou=users,${portunus.ldap.suffix}
''; bind_password_file: ${config.sops.secrets.matrix_ldap_search.path}
'';
}) })
]; ];
}; };

2
modules/nextcloud.nix
View file

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
domain = "nc.${config.fsr.domain}"; domain = "nc.staging.ifsr.de";
legacy_domain = "oc.ifsr.de"; legacy_domain = "oc.ifsr.de";
in in
{ {