NixOS 24.11 fixes
This commit is contained in:
@@ -20,7 +20,7 @@ in {
|
||||
port = 8080;
|
||||
|
||||
settings = {
|
||||
acl_policy_path = null;
|
||||
policy.path = null;
|
||||
ip_prefixes = [
|
||||
"100.64.0.0/10"
|
||||
];
|
||||
@@ -30,8 +30,8 @@ in {
|
||||
update_frequency = "24h";
|
||||
urls = [];
|
||||
};
|
||||
dns_config = {
|
||||
base_domain = "vimium.net";
|
||||
dns = {
|
||||
base_domain = "mesh.vimium.net";
|
||||
extra_records = [
|
||||
{
|
||||
name = "grafana.mesh.vimium.net";
|
||||
@@ -45,7 +45,7 @@ in {
|
||||
}
|
||||
];
|
||||
magic_dns = true;
|
||||
nameservers = [
|
||||
nameservers.global = [
|
||||
"9.9.9.9"
|
||||
];
|
||||
};
|
||||
|
@@ -28,9 +28,6 @@ in {
|
||||
default = "vimium.com";
|
||||
example = "vimium.com";
|
||||
};
|
||||
slidingSync = {
|
||||
enable = lib.mkEnableOption "sliding-sync";
|
||||
};
|
||||
usePostgresql = lib.mkEnableOption "postgresql";
|
||||
};
|
||||
|
||||
@@ -45,9 +42,6 @@ in {
|
||||
"m.identity_server" = {
|
||||
"base_url" = "https://vector.im";
|
||||
};
|
||||
"org.matrix.msc3575.proxy" = if cfg.slidingSync.enable then {
|
||||
"url" = "https://${matrixSubdomain}";
|
||||
} else { };
|
||||
};
|
||||
matrixServerConfig."m.server" = "${matrixSubdomain}:443";
|
||||
commonBridgeSettings = bridge: {
|
||||
@@ -136,13 +130,6 @@ in {
|
||||
'';
|
||||
};
|
||||
"/_synapse/client".proxyPass = "http://localhost:8008";
|
||||
"~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = lib.mkIf cfg.slidingSync.enable {
|
||||
priority = 100;
|
||||
proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
|
||||
extraConfig = ''
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
"${cfg.serverName}" = let
|
||||
@@ -196,18 +183,6 @@ in {
|
||||
(lib.optional cfg.bridges.whatsapp
|
||||
config.systemd.services.mautrix-whatsapp.serviceConfig.Group);
|
||||
|
||||
age.secrets = if cfg.slidingSync.enable then {
|
||||
"files/services/matrix/sliding-sync" = {
|
||||
file = "${self.inputs.secrets}/files/services/matrix/sliding-sync.age";
|
||||
};
|
||||
} else {};
|
||||
|
||||
services.matrix-sliding-sync = lib.mkIf cfg.slidingSync.enable {
|
||||
enable = true;
|
||||
environmentFile = config.age.secrets."files/services/matrix/sliding-sync".path;
|
||||
settings = { SYNCV3_SERVER = "https://${matrixSubdomain}"; };
|
||||
};
|
||||
|
||||
services.postgresql = lib.mkIf cfg.usePostgresql {
|
||||
ensureUsers = [
|
||||
{
|
||||
|
Reference in New Issue
Block a user