Compare commits
No commits in common. "fc30e65cf460c7dd5dd50244e897a64f6aa4af74" and "4e2a081671fca211cab6a3459ff9c039a72820b3" have entirely different histories.
fc30e65cf4
...
4e2a081671
|
@ -280,11 +280,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730041422,
|
"lastModified": 1707424749,
|
||||||
"narHash": "sha256-aEz5/yUJN/PSEXwPBuKMs2FbAmz68fDIQ9B0tVRVmTo=",
|
"narHash": "sha256-eTvts5E3zmD4/DoAI9KedQjRwica0cg36wwIVp1NWbM=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "09f7b1ed16c99f5fb5c5f9a2a73ccc9ff0645b35",
|
"rev": "1202a23c205b3c07a5feb5caf6813f21b3c69307",
|
||||||
"revCount": 32,
|
"revCount": 30,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pub.solar/pub-solar/keycloak-theme"
|
"url": "https://git.pub.solar/pub-solar/keycloak-theme"
|
||||||
},
|
},
|
||||||
|
|
|
@ -63,21 +63,18 @@
|
||||||
# matrix-synapse
|
# matrix-synapse
|
||||||
age.secrets."nachtigall-matrix-synapse-signing-key" = {
|
age.secrets."nachtigall-matrix-synapse-signing-key" = {
|
||||||
file = "${flake.self}/secrets/nachtigall-matrix-synapse-signing-key.age";
|
file = "${flake.self}/secrets/nachtigall-matrix-synapse-signing-key.age";
|
||||||
path = "/run/agenix/matrix-synapse-signing-key";
|
|
||||||
mode = "400";
|
mode = "400";
|
||||||
owner = "matrix-synapse";
|
owner = "matrix-synapse";
|
||||||
};
|
};
|
||||||
|
|
||||||
age.secrets."nachtigall-matrix-synapse-secret-config.yaml" = {
|
age.secrets."nachtigall-matrix-synapse-secret-config.yaml" = {
|
||||||
file = "${flake.self}/secrets/nachtigall-matrix-synapse-secret-config.yaml.age";
|
file = "${flake.self}/secrets/nachtigall-matrix-synapse-secret-config.yaml.age";
|
||||||
path = "/run/agenix/matrix-synapse-secret-config.yaml";
|
|
||||||
mode = "400";
|
mode = "400";
|
||||||
owner = "matrix-synapse";
|
owner = "matrix-synapse";
|
||||||
};
|
};
|
||||||
|
|
||||||
age.secrets."nachtigall-matrix-synapse-sliding-sync-secret" = {
|
age.secrets."nachtigall-matrix-synapse-sliding-sync-secret" = {
|
||||||
file = "${flake.self}/secrets/nachtigall-matrix-synapse-sliding-sync-secret.age";
|
file = "${flake.self}/secrets/nachtigall-matrix-synapse-sliding-sync-secret.age";
|
||||||
path = "/run/agenix/matrix-synapse-sliding-sync-secret";
|
|
||||||
mode = "400";
|
mode = "400";
|
||||||
owner = "matrix-synapse";
|
owner = "matrix-synapse";
|
||||||
};
|
};
|
||||||
|
@ -85,7 +82,6 @@
|
||||||
|
|
||||||
pub-solar-os.matrix-synapse = {
|
pub-solar-os.matrix-synapse = {
|
||||||
enable = true;
|
enable = true;
|
||||||
sliding-sync.enable = true;
|
|
||||||
signing_key_path = config.age.secrets."nachtigall-matrix-synapse-signing-key".path;
|
signing_key_path = config.age.secrets."nachtigall-matrix-synapse-signing-key".path;
|
||||||
extra-config-files = [
|
extra-config-files = [
|
||||||
config.age.secrets."nachtigall-matrix-synapse-secret-config.yaml".path
|
config.age.secrets."nachtigall-matrix-synapse-secret-config.yaml".path
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
{
|
{
|
||||||
age.secrets."nachtigall-coturn-static-auth-secret" = {
|
age.secrets."nachtigall-coturn-static-auth-secret" = {
|
||||||
file = "${flake.self}/secrets/nachtigall-coturn-static-auth-secret.age";
|
file = "${flake.self}/secrets/nachtigall-coturn-static-auth-secret.age";
|
||||||
path = "/run/agenix/coturn-static-auth-secret";
|
|
||||||
mode = "400";
|
mode = "400";
|
||||||
owner = "turnserver";
|
owner = "turnserver";
|
||||||
};
|
};
|
||||||
|
@ -19,7 +18,7 @@
|
||||||
min-port = 49000;
|
min-port = 49000;
|
||||||
max-port = 50000;
|
max-port = 50000;
|
||||||
use-auth-secret = true;
|
use-auth-secret = true;
|
||||||
static-auth-secret-file = config.age.secrets."nachtigall-coturn-static-auth-secret".path;
|
static-auth-secret-file = "/run/agenix/nachtigall-coturn-static-auth-secret";
|
||||||
realm = "turn.${config.pub-solar-os.networking.domain}";
|
realm = "turn.${config.pub-solar-os.networking.domain}";
|
||||||
cert = "${config.security.acme.certs.${realm}.directory}/full.pem";
|
cert = "${config.security.acme.certs.${realm}.directory}/full.pem";
|
||||||
pkey = "${config.security.acme.certs.${realm}.directory}/key.pem";
|
pkey = "${config.security.acme.certs.${realm}.directory}/key.pem";
|
||||||
|
|
|
@ -30,10 +30,6 @@ in
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
default = "${config.services.matrix-synapse.dataDir}/homeserver.signing.key";
|
default = "${config.services.matrix-synapse.dataDir}/homeserver.signing.key";
|
||||||
};
|
};
|
||||||
sliding-sync.enable = lib.mkEnableOption {
|
|
||||||
description = "Whether to enable a sliding-sync proxy, no longer needed with synapse version 1.114+";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf config.pub-solar-os.matrix-synapse.enable {
|
config = lib.mkIf config.pub-solar-os.matrix-synapse.enable {
|
||||||
|
@ -265,17 +261,17 @@ in
|
||||||
plugins = [ config.services.matrix-synapse.package.plugins.matrix-synapse-shared-secret-auth ];
|
plugins = [ config.services.matrix-synapse.package.plugins.matrix-synapse-shared-secret-auth ];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.matrix-sliding-sync = {
|
#services.matrix-sliding-sync = {
|
||||||
enable = config.pub-solar-os.matrix-synapse.sliding-sync.enable;
|
# enable = true;
|
||||||
settings = {
|
# settings = {
|
||||||
SYNCV3_SERVER = "https://${publicDomain}";
|
# SYNCV3_SERVER = "https://${publicDomain}";
|
||||||
SYNCV3_BINDADDR = "127.0.0.1:8011";
|
# SYNCV3_BINDADDR = "127.0.0.1:8011";
|
||||||
# The bind addr for Prometheus metrics, which will be accessible at
|
# # The bind addr for Prometheus metrics, which will be accessible at
|
||||||
# /metrics at this address
|
# # /metrics at this address
|
||||||
SYNCV3_PROM = "127.0.0.1:9100";
|
# SYNCV3_PROM = "127.0.0.1:9100";
|
||||||
};
|
# };
|
||||||
environmentFile = config.age.secrets."nachtigall-matrix-synapse-sliding-sync-secret".path;
|
# environmentFile = config.age.secrets."matrix-synapse-sliding-sync-secret".path;
|
||||||
};
|
#};
|
||||||
|
|
||||||
pub-solar-os.backups.restic.matrix-synapse = {
|
pub-solar-os.backups.restic.matrix-synapse = {
|
||||||
paths = [
|
paths = [
|
||||||
|
|
Loading…
Reference in a new issue