diff --git a/modules/caddy/Caddyfile b/modules/caddy/Caddyfile index f39de69..28b5ce4 100644 --- a/modules/caddy/Caddyfile +++ b/modules/caddy/Caddyfile @@ -28,7 +28,7 @@ broccoli.town:8448 { broccoli.town { header /.well-known/* "Access-Control-Allow-Origin" "*" - respond /.well-known/matrix/client `{ "m.homeserver": { "base_url": "https://broccoli.town" }, "org.matrix.msc3575.proxy": { "url": "https://syncv3.broccoli.town" } }` + respond /.well-known/matrix/client `{ "m.homeserver": { "base_url": "https://broccoli.town" } }` reverse_proxy /_matrix/* http://localhost:8008 reverse_proxy /_synapse/client/* http://localhost:8008 diff --git a/modules/synapse/default.nix b/modules/synapse/default.nix index 3ef212c..ea365e3 100644 --- a/modules/synapse/default.nix +++ b/modules/synapse/default.nix @@ -6,9 +6,6 @@ }: let fqdn = "matrix.broccoli.town"; in { - age.secrets = { - sliding_sync_env_file.file = ../../secrets/sliding_sync_env_file.age; - }; services.postgresql = { enable = true; ensureUsers = [ @@ -21,14 +18,6 @@ in { ]; }; - services.matrix-sliding-sync = { - enable = true; - environmentFile = config.age.secrets.sliding_sync_env_file.path; - settings = { - SYNCV3_SERVER = "http://localhost:8008"; - }; - }; - services.matrix-synapse = { enable = true; settings = { diff --git a/secrets/secrets.nix b/secrets/secrets.nix index bf2fbad..310acb3 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -28,7 +28,6 @@ in { "bigding_backup_repo_password.age".publicKeys = users ++ [system4]; "sendmail_email_key_gitea.age".publicKeys = users ++ [system4]; "gitea_actions_runner_token.age".publicKeys = users ++ [system4]; - "sliding_sync_env_file.age".publicKeys = users ++ [system4]; "danflix_hetzner_storage_box_pub_key.age".publicKeys = users ++ [system4]; "danflix_storage_box_crypt_pw.age".publicKeys = users ++ [system4]; "danflix_storage_box_crypt_obscured_pw.age".publicKeys = users ++ [system4]; diff --git a/secrets/sliding_sync_env_file.age b/secrets/sliding_sync_env_file.age deleted file mode 100644 index 1442dce..0000000 --- a/secrets/sliding_sync_env_file.age +++ /dev/null @@ -1,17 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 eYYv1Q 7TKz5P08MWm671YjNZZBcfYifTxCLQRld/yEDUvg/mo -Ri7tvBi03wGjkUyfqOYDUV2uy1KUqzJh+G/gXfb7VZ4 --> ssh-ed25519 Bp5IaA pUWO9BOFN6lvXMqCEuN8ac4a40eBKyZNif+IMy20MVs -OItLZfWVbBzaz6Kc24MvPZX9nenwZanTqfBLHwkG6x0 --> ssh-ed25519 T/DpgA 8iff5RUhuZTQQ8R52lYOp1lFFCriG61mJJ04l3R2lSo -hOGYWfMkhmwqBGnF3NTH3/e49YWMLNwaWxI7liZjvlc --> ssh-ed25519 qMgRFg b1JR35lDwcQllMmEZ4yJ4XmI6aBhESILLAe3LHG1Hgc -lBxwrrquC7Ncv4/IGGIabdCcjEw73J6UzjORP0TUdkY --> ssh-ed25519 dMZXNw 0/n4Qw/C/wt0+7SqUJoAdNlt8E7xBCfoYmwHCEVJ4zM -t3MWE0aSIDdJNRPF5HQZ5DWXzO2AMjapEEBa2JHelrI --> ssh-ed25519 70Nt2Q PyFn7VfxEgUtgN5yE4zq66eWTASq7TnH0ZJEY0P1Ei8 -kFwfeeSEG4XX//SkUd72KuMNpkbmq2zDXyDBz3rmy88 --> >YOx)y>-grease vP? y$B-[ Zv&X TwB -VT4wxcaS1aosiUDafpLhzCpPFyozKE9Q/tZKnr7rPqnSTGB5sL99DX7iY91V7Q ---- ee2Sc/l314nyNlFgxOfi9VJzTnU8x5Kgy9/o6XgJc8Q -XN7,vd]왔imkx ӯ$OA6Eo߰Ԥ+˱ت𫮉Chۤit?!hoW[}䨪3uWGy \ No newline at end of file