From b224f278c9d24150134bf89b999171a5e71b95d6 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Fri, 15 Sep 2023 13:04:24 +0200 Subject: [PATCH] matrix, nextcloud: pin domain to staging --- modules/matrix.nix | 35 ++++++++++++++++++----------------- modules/nextcloud.nix | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/modules/matrix.nix b/modules/matrix.nix index 5823705..120670f 100644 --- a/modules/matrix.nix +++ b/modules/matrix.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - domainServer = "matrix.${config.fsr.domain}"; - domainClient = "chat.${config.fsr.domain}"; + domainServer = "matrix.staging.ifsr.de"; + domainClient = "chat.staging.ifsr.de"; clientConfig = { "m.homeserver" = { @@ -96,21 +96,22 @@ in extraConfigFiles = [ (pkgs.writeTextFile { name = "matrix-synapse-extra-config.yml"; - text = let portunus = config.services.portunus; in '' - modules: - - module: ldap_auth_provider.LdapAuthProviderModule - config: - enabled: true - uri: ldap://localhost - base: ou=users,${portunus.ldap.suffix} - # taken from kaki config - attributes: - uid: uid - mail: uid - name: cn - bind_dn: uid=search,ou=users,${portunus.ldap.suffix} - bind_password_file: ${config.sops.secrets.matrix_ldap_search.path} - ''; + text = let portunus = config.services.portunus; in + '' + modules: + - module: ldap_auth_provider.LdapAuthProviderModule + config: + enabled: true + uri: ldap://localhost + base: ou=users,${portunus.ldap.suffix} + # taken from kaki config + attributes: + uid: uid + mail: uid + name: cn + bind_dn: uid=search,ou=users,${portunus.ldap.suffix} + bind_password_file: ${config.sops.secrets.matrix_ldap_search.path} + ''; }) ]; }; diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix index ff5c191..7a3bdf6 100644 --- a/modules/nextcloud.nix +++ b/modules/nextcloud.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: let - domain = "nc.${config.fsr.domain}"; + domain = "nc.staging.ifsr.de"; legacy_domain = "oc.ifsr.de"; in {