remove sliding sync proxy

2024-09-26 14:01:05 +02:00 · 2024-09-26 14:01:05 +02:00 · 11c0dcfd86
commit 11c0dcfd86
parent 389c5159fb
12 changed files with 6 additions and 281 deletions
--- a/config/instance-20221213-1915.nix
+++ b/config/instance-20221213-1915.nix
@ -22,7 +22,6 @@
    ./services/reverse-proxy.nix
    ./wireguard
    ./zfs.nix
-    ./services/matrix-sliding-sync.nix
    #./services/kubernetes.nix
  ];

--- a/config/services/matrix-media-repo.nix
+++ b/config/services/matrix-media-repo.nix
@ -183,7 +183,7 @@ in {
        handle /.well-known/matrix/client {
          header Access-Control-Allow-Origin *
          header Content-Type application/json
-          respond "{ \"m.homeserver\": { \"base_url\": \"https://matrix.chir.rs\" }, \"org.matrix.msc3575.proxy\": {\"url\": \"https://sliding-sync.chir.rs\"} }" 200
+          respond "{ \"m.homeserver\": { \"base_url\": \"https://matrix.chir.rs\" } }" 200
        }
      }
    '';
--- a/config/services/matrix-sliding-sync.nix
+++ b/config/services/matrix-sliding-sync.nix
@ -1,45 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-  systemd.services.sliding-sync = {
-    description = "Sliding sync proxy for matrix";
-    after = ["network.target" "matrix-synapse.service"];
-    wantedBy = ["multi-user.target"];
-    environment = {
-      SYNCV3_SERVER = "https://matrix.chir.rs";
-      SYNCV3_DB = "postgresql:///sliding_sync?sslmode=disable&host=/run/postgresql";
-      SYNCV3_BINDADDR = "127.0.0.1:45587";
-      SYNCV3_PROM = "0.0.0.0:50372";
-      SYNCV3_OTLP_URL = "http://localhost:4317";
-      SYNCV3_SENTRY_DSN = "https://18e36e6f16b5490c83364101717cddba@o253952.ingest.sentry.io/6449283";
-    };
-    serviceConfig = {
-      Type = "simple";
-      User = "sliding-sync";
-      Group = "sliding-sync";
-      Restart = "always";
-      EnvironmentFile = config.sops.secrets."services/mautrix/sliding-sync".path;
-      ExecStart = "${pkgs.sliding-sync}/bin/syncv3";
-    };
-  };
-  sops.secrets."services/mautrix/sliding-sync" = {};
-  users.users.sliding-sync = {
-    description = "Matrix sliding sync proxy";
-    isSystemUser = true;
-    group = "sliding-sync";
-  };
-  users.groups.sliding-sync = {};
-  services.postgresql.ensureDatabases = ["sliding_sync"];
-
-  services.caddy.virtualHosts."sliding-sync.chir.rs" = {
-    useACMEHost = "chir.rs";
-    logFormat = pkgs.lib.mkForce "";
-    extraConfig = ''
-      import baseConfig
-
-      reverse_proxy http://127.0.0.1:45587
-    '';
-  };
-}
--- a/config/services/prometheus.nix
+++ b/config/services/prometheus.nix
@ -125,16 +125,6 @@
          }
        ];
      }
-      {
-        job_name = "matrix-sliding-sync";
-        static_configs = [
-          {
-            targets = [
-              "instance-20221213-1915.int.chir.rs:50372"
-            ];
-          }
-        ];
-      }
    ];
  };
  sops.secrets."services/akkoma-key".owner = "prometheus";
--- a/config/services/reverse-proxy.nix
+++ b/config/services/reverse-proxy.nix
@ -174,7 +174,7 @@ in {
        handle /.well-known/matrix/client {
          header Access-Control-Allow-Origin *
          header Content-Type application/json
-          respond "{ \"m.homeserver\": { \"base_url\": \"https://matrix.chir.rs\" }, \"org.matrix.msc3575.proxy\": {\"url\": \"https://sliding-sync.chir.rs\"} }" 200
+          respond "{ \"m.homeserver\": { \"base_url\": \"https://matrix.chir.rs\" } }" 200
        }
      '';
    };
--- a/flake.nix
+++ b/flake.nix
@ -267,7 +267,6 @@ rec {
          plover-plugin-stenotype-extended
          asar-asm
          bsnes-plus
-          sliding-sync
          yiffstash
          plover-plugin-dict-commands
          plover-plugin-last-translation
--- a/overlays/default.nix
+++ b/overlays/default.nix
@ -63,7 +63,6 @@ inputs: system: self: prev: let
    old-homepage = self.callPackage ../packages/web/old-homepage.nix {};
    asar-asm = self.callPackage ../packages/compiler/asar {};
    bsnes-plus = self.libsForQt5.callPackage ../packages/emulator/bsnes-plus {};
-    sliding-sync = self.callPackage ../packages/matrix/sliding-sync {};
    yiffstash = self.python3Packages.callPackage ../packages/python/yiffstash.nix {};
  };
  perSystem = {
--- a/packages/matrix/sliding-sync/default.nix
+++ b/packages/matrix/sliding-sync/default.nix
@ -1,37 +0,0 @@
-{
-  buildGoApplication,
-  olm,
-  fetchFromGitHub,
-  lib,
-  writeScript,
-  go,
-}: let
-  source = builtins.fromJSON (builtins.readFile ./source.json);
-in
-  buildGoApplication rec {
-    pname = "sliding-sync";
-    version = source.date;
-    src = fetchFromGitHub {
-      owner = "matrix-org";
-      repo = "sliding-sync";
-      inherit (source) rev sha256;
-    };
-    modules = ./gomod2nix.toml;
-    buildInputs = [
-      olm
-    ];
-    CGO_ENABLED = "1";
-    doCheck = false;
-    meta = {
-      description = "sliding sync proxy";
-      license = lib.licenses.asl20;
-      broken = builtins.compareVersions go.version "1.18" < 0;
-    };
-    passthru.updateScript = writeScript "update-sliding-sync" ''
-      ${../../scripts/update-git.sh} "https://github.com/matrix-org/sliding-sync" matrix/sliding-sync/source.json
-      if [ "$(git diff -- matrix/sliding-sync/source.json)" ]; then
-        SRC_PATH=$(nix-build -E '(import ../.).packages.x86_64-linux.${pname}.src')
-        ${../../scripts/update-go.sh} $SRC_PATH matrix/sliding-sync/
-      fi
-    '';
-  }
--- a/packages/matrix/sliding-sync/gomod2nix.toml
+++ b/packages/matrix/sliding-sync/gomod2nix.toml
@ -1,165 +0,0 @@
-schema = 3
-
-[mod]
-  [mod."github.com/ReneKroon/ttlcache/v2"]
-    version = "v2.8.1"
-    hash = "sha256-Qn8ARU4j35e8CUBa9OwW2xHM7ERKuorJP+9F/thjrt4="
-  [mod."github.com/beorn7/perks"]
-    version = "v1.0.1"
-    hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4="
-  [mod."github.com/cenkalti/backoff/v4"]
-    version = "v4.2.1"
-    hash = "sha256-CKogmPe0pCcAdpztzPwr24rLTJZfq8QVZ9AUduwAcoA="
-  [mod."github.com/cespare/xxhash/v2"]
-    version = "v2.2.0"
-    hash = "sha256-nPufwYQfTkyrEkbBrpqM3C2vnMxfIz6tAaBmiUP7vd4="
-  [mod."github.com/felixge/httpsnoop"]
-    version = "v1.0.3"
-    hash = "sha256-qV3UPYKKBQDTzAUzzsTpfdbGhFnkmTO/r5ylPL1SyfA="
-  [mod."github.com/fxamacker/cbor/v2"]
-    version = "v2.5.0"
-    hash = "sha256-2rhvuNZjeidDP+Og6Q0u4ROiaPrEOjoI5wCb17XRnOQ="
-  [mod."github.com/getsentry/sentry-go"]
-    version = "v0.24.1"
-    hash = "sha256-R4QLkZwdUNgtGCqLcihcOY/F5GOOxthkAIK6jlgBjw4="
-  [mod."github.com/go-logr/logr"]
-    version = "v1.2.4"
-    hash = "sha256-+FhzmqKsAnsra5p8LuxENXJBHSeuWjQG8Tzhpyd/ps4="
-  [mod."github.com/go-logr/stdr"]
-    version = "v1.2.2"
-    hash = "sha256-rRweAP7XIb4egtT1f2gkz4sYOu7LDHmcJ5iNsJUd0sE="
-  [mod."github.com/golang/protobuf"]
-    version = "v1.5.3"
-    hash = "sha256-svogITcP4orUIsJFjMtp+Uv1+fKJv2Q5Zwf2dMqnpOQ="
-  [mod."github.com/gorilla/mux"]
-    version = "v1.8.0"
-    hash = "sha256-s905hpzMH9bOLue09E2JmzPXfIS4HhAlgT7g13HCwKE="
-  [mod."github.com/grpc-ecosystem/grpc-gateway/v2"]
-    version = "v2.17.0"
-    hash = "sha256-EZTOzai8AoC4pTh3V4KcLbsGR+1b6U0WltkrZZA0YKg="
-  [mod."github.com/jmoiron/sqlx"]
-    version = "v1.3.3"
-    hash = "sha256-bhpbvoyhgRME1EMQFBWR0vl/wWfuk4ZuKmELH9Sox/M="
-  [mod."github.com/lib/pq"]
-    version = "v1.10.9"
-    hash = "sha256-Gl6dLtL+yk6UrTTWfas43aM4lP/pNa2l7+ITXnjQyKs="
-  [mod."github.com/matrix-org/complement"]
-    version = "v0.0.0-20231102222540-7efd8fce6d58"
-    hash = "sha256-mdm+PRJ5pzMYdB8iRJXeuCSE1bcAONmhsOST8Mh3qfI="
-  [mod."github.com/matrix-org/gomatrix"]
-    version = "v0.0.0-20220926102614-ceba4d9f7530"
-    hash = "sha256-q1wuafVA5IiyzSFatpIDl8+gLF98b2/m4Rusr9b83lU="
-  [mod."github.com/matrix-org/gomatrixserverlib"]
-    version = "v0.0.0-20230921171121-0466775328c7"
-    hash = "sha256-jcnLQnmaJnII2RPOSTAgLeNzFns4VhciaFaWR1tVncU="
-  [mod."github.com/matrix-org/util"]
-    version = "v0.0.0-20221111132719-399730281e66"
-    hash = "sha256-B9K93f1vgsLXwDgnZPDXIYeVlgaSlml/WxCEsyPl8c0="
-  [mod."github.com/mattn/go-colorable"]
-    version = "v0.1.13"
-    hash = "sha256-qb3Qbo0CELGRIzvw7NVM1g/aayaz4Tguppk9MD2/OI8="
-  [mod."github.com/mattn/go-isatty"]
-    version = "v0.0.19"
-    hash = "sha256-wYQqGxeqV3Elkmn26Md8mKZ/viw598R4Ych3vtt72YE="
-  [mod."github.com/matttproud/golang_protobuf_extensions"]
-    version = "v1.0.1"
-    hash = "sha256-ystDNStxR90j4CK+AMcEQ5oyYFRgWoGdvWlS0XQMDLQ="
-  [mod."github.com/pressly/goose/v3"]
-    version = "v3.14.0"
-    hash = "sha256-BoTCzWcRd3DJQmhY+6j48bguPxIrohOTM0M+yhxpdbs="
-  [mod."github.com/prometheus/client_golang"]
-    version = "v1.13.0"
-    hash = "sha256-5nC5FuGuAB71k6Dm4vBcmpPpBAKfvArO/yr7e9rfQfg="
-  [mod."github.com/prometheus/client_model"]
-    version = "v0.2.0"
-    hash = "sha256-LTHxYPRgoggl+v89ly2/RkyPIuJlmZRdGs6ZRtK3zkk="
-  [mod."github.com/prometheus/common"]
-    version = "v0.37.0"
-    hash = "sha256-B2v0WsP8uKWYBpZcrog/sQXStIXwWZcVLmfPgnh1ZZA="
-  [mod."github.com/prometheus/procfs"]
-    version = "v0.11.0"
-    hash = "sha256-dfbKDyKmL+BNGVuvEZmw1CiGBiwqUADxJKkIi1Sbv1Y="
-  [mod."github.com/rs/xid"]
-    version = "v1.4.0"
-    hash = "sha256-X7WH1cxWBof4m8ZWCnP0VYQdwzBti2eoa/sqm3BmLcg="
-  [mod."github.com/rs/zerolog"]
-    version = "v1.29.0"
-    hash = "sha256-CVRSKk2O0nwAbu0fVY/JXpKaubJHhy9gtnSbEykPO3k="
-  [mod."github.com/sirupsen/logrus"]
-    version = "v1.9.3"
-    hash = "sha256-EnxsWdEUPYid+aZ9H4/iMTs1XMvCLbXZRDyvj89Ebms="
-  [mod."github.com/tidwall/gjson"]
-    version = "v1.16.0"
-    hash = "sha256-dpOHsSigxmZYBDTYO4d7jL4aTHUTPWDerogprK9/Iyw="
-  [mod."github.com/tidwall/match"]
-    version = "v1.1.1"
-    hash = "sha256-M2klhPId3Q3T3VGkSbOkYl/2nLHnsG+yMbXkPkyrRdg="
-  [mod."github.com/tidwall/pretty"]
-    version = "v1.2.1"
-    hash = "sha256-S0uTDDGD8qr415Ut7QinyXljCp0TkL4zOIrlJ+9OMl8="
-  [mod."github.com/tidwall/sjson"]
-    version = "v1.2.5"
-    hash = "sha256-OYGNolkmL7E1Qs2qrQ3IVpQp5gkcHNU/AB/z2O+Myps="
-  [mod."github.com/x448/float16"]
-    version = "v0.8.4"
-    hash = "sha256-VKzMTMS9pIB/cwe17xPftCSK9Mf4Y6EuBEJlB4by5mE="
-  [mod."go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"]
-    version = "v0.44.0"
-    hash = "sha256-V1fEoq1PpHB7KJ6ScfRNGFIrmMV03gOlyXCSCDQkLws="
-  [mod."go.opentelemetry.io/contrib/propagators/jaeger"]
-    version = "v1.18.0"
-    hash = "sha256-T5Cv8Am1H5ypybI0RvFAa9fgpDjPls7Z5C0vARymMi4="
-  [mod."go.opentelemetry.io/otel"]
-    version = "v1.18.0"
-    hash = "sha256-gRETIwDXVMuxGZEoX2/SXkMvxNI3j7Qz0FCAYh2bKZ0="
-  [mod."go.opentelemetry.io/otel/exporters/otlp/otlptrace"]
-    version = "v1.18.0"
-    hash = "sha256-G29mBcyJbNK1JXy45lfISE/iUc9/LMlWCnwJLV8YCeU="
-  [mod."go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"]
-    version = "v1.18.0"
-    hash = "sha256-ywp75OWF51CHG23Qe1P+h94w90T3dalaurW1Os+T1xc="
-  [mod."go.opentelemetry.io/otel/metric"]
-    version = "v1.18.0"
-    hash = "sha256-rSQRem8ZO6N7LKgRikJ3Ffv6g1dMeXUh+cOwT/VLuPM="
-  [mod."go.opentelemetry.io/otel/sdk"]
-    version = "v1.18.0"
-    hash = "sha256-61OrnQD/LeXh+kkp/yE+HOiPdWaVHe5NnE8f4UbV8xs="
-  [mod."go.opentelemetry.io/otel/trace"]
-    version = "v1.18.0"
-    hash = "sha256-wLwQZwb7dw6lbhBm2i1Pm8SpVW+XDmOKYYm/HE/b/w4="
-  [mod."go.opentelemetry.io/proto/otlp"]
-    version = "v1.0.0"
-    hash = "sha256-w2WbhXXshdm/ZmZkg5VpWwXFLjJRBBwSObyHGjJcELQ="
-  [mod."golang.org/x/crypto"]
-    version = "v0.14.0"
-    hash = "sha256-UUSt3X/i34r1K0mU+Y5IzljX5HYy07JcHh39Pm1MU+o="
-  [mod."golang.org/x/exp"]
-    version = "v0.0.0-20230905200255-921286631fa9"
-    hash = "sha256-CyeVwjp12Wqh4ptqfi3KHCWPzOFhE8fSrP3sMjMXvec="
-  [mod."golang.org/x/net"]
-    version = "v0.17.0"
-    hash = "sha256-qRawHWLSsJ06QNbLhUWPXGVSO1eaioeC9xZlUEWN8J8="
-  [mod."golang.org/x/sync"]
-    version = "v0.3.0"
-    hash = "sha256-bCJKLvwExhYacH2ZrWlZ38lr1d6oNenNt2m1QqDCs0o="
-  [mod."golang.org/x/sys"]
-    version = "v0.13.0"
-    hash = "sha256-/+RDZ0a0oEfJ0k304VqpJpdrl2ZXa3yFlOxy4mjW7w0="
-  [mod."golang.org/x/text"]
-    version = "v0.13.0"
-    hash = "sha256-J34dbc8UNVIdRJUZP7jPt11oxuwG8VvrOOylxE7V3oA="
-  [mod."google.golang.org/genproto/googleapis/api"]
-    version = "v0.0.0-20230822172742-b8732ec3820d"
-    hash = "sha256-qd9dJezVHNJZNMkywXapT1rsyD+lb25AU8aG8NJlhm4="
-  [mod."google.golang.org/genproto/googleapis/rpc"]
-    version = "v0.0.0-20230822172742-b8732ec3820d"
-    hash = "sha256-1kP7lqQ+fKtARDzTrRNob0owX4GsUnxzOwLyBZSmHOc="
-  [mod."google.golang.org/grpc"]
-    version = "v1.58.3"
-    hash = "sha256-YxXO1UAc/+4E0bsSsGSiFNrY3yyR6AIml/1sVY2QJjQ="
-  [mod."google.golang.org/protobuf"]
-    version = "v1.31.0"
-    hash = "sha256-UdIk+xRaMfdhVICvKRk1THe3R1VU+lWD8hqoW/y8jT0="
-  [mod."maunium.net/go/mautrix"]
-    version = "v0.11.0"
-    hash = "sha256-Mr0vqRMiKcf1OB/HVusFt/LizklScyGFs75mV6gU/bQ="
--- a/packages/matrix/sliding-sync/source.json
+++ b/packages/matrix/sliding-sync/source.json
@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/matrix-org/sliding-sync",
-  "rev": "c23af6099be9df0de2f5fb4a7dcaa458ab388e86",
-  "date": "2024-09-13T16:32:55+01:00",
-  "path": "/nix/store/m6a4az15lg47s37h3ria8g2nxa1a4q9h-sliding-sync",
-  "sha256": "195dsz3l10pg75k8jq4ajah58gf7h3awbjxgw670b2xj9p3gmylj",
-  "hash": "sha256-kvr6xk2yiwWO4a/LxdWAxz1UoJKKYIlmOe+CQMfXraQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
--- a/secrets/instance-20221213-1915.yaml
+++ b/secrets/instance-20221213-1915.yaml
@ -8,8 +8,6 @@ security:
        gcloud.json: ENC[AES256_GCM,data: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,iv:64OaUxQSM4c2Iv9BcSItCHieepFhdXopvn911ZprsGU=,tag:bLVDYXET9ThqKFzjZSh5dw==,type:str]
        gcloud: ENC[AES256_GCM,data:V+71RbCEZAQ+dCqIqLhpdivkdBlqBzmzMwqepQraCfZXF/T8cnGbdN8IDY35oV3B/y7lhY0XEj3HX/IEyx/Yuw==,iv:B8ddqDGOsETimp4YKHjxUJ/JG5HgTZ+4P7aNN9/8h8A=,tag:c5pRh8KkxO9V9cs8RSm52A==,type:str]
 services:
-    mautrix:
-        sliding-sync: ENC[AES256_GCM,data:u6jocGFkIRv+Dxm007IDIhDviq6cOuE8U/Rhu3XNRfgU2MthlTfx4xXCAM1J46K3kEvLqR4/oQhwwXJV0w/G9g91fTbvZjH+YIjF/9QCyA==,iv:PnML1pdO0Zcw8UC+UtJ9aCV5++nrkb8MkZV/x7vLO9E=,tag:mZQGFw4AOr53LcfBF9hTAQ==,type:str]
    attic: ENC[AES256_GCM,data:+YhjQbgXUMlkTI/TmDV4RYrB51EVB9E5AYC3bk7NXfgGa3UYj7BP3rgMloAShXZ8AY49kcZGcs7v16v62RmUkdfuiMv0LsHez6JsGWil+duEKhBSOBr6oFJWOAJHRHPmenXG4yzHv4H+awTWzZRzPDGsFye6rO+PSZHisdCOQdNpzL7o42m+H6DsWOvsohuNiWOSVS1f9yygEk6x/6/aOXU8sKbf9YWH7aFcCBy0wI4BmjruHHD1N+XfHZ+pDqn8fOCZOVJ0EpTTFy3jg12WERRFUufmjWrN/HAIza3fwykYfx0VUU8ucw==,iv:6WpQGtEG5RLMVv6PcIbwVx9V/naZIquYR4iIrvSszAE=,tag:UydfZUBOMLhzYxkm3/0DuA==,type:str]
    chir-rs:
        database-password: ENC[AES256_GCM,data:BfoHblko9WJSv1vKemolK0HCODVV705udJmkKO6nGyI=,iv:PdXQwFlmCrkEhfpsLqjX+DVlWngWvyh3rfWu5r27pI0=,tag:NY9+q+ANmi/RDUMLAOuZNg==,type:str]
@ -52,8 +50,8 @@ sops:
            MlFHb1lUWUVaY1Q3bFRPSkdEVWlUN28Kl9GWvEOoDVqvxTGxDhrj6uwcGKwawCyo
            bzdNfnpDUFP8DWuZ5zrZsvoRmthWitfdVTet55Ui/QrDe1E4ZTheSg==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-06T11:48:44Z"
-    mac: ENC[AES256_GCM,data:LQN3eICB7PFZ+067pE/oUO5s/QZa6+GQPVTJzYXLlvuqYrc8PZ1+qA0sW60N6tAIXblG80Y6zKcBEZ7lH82GCrzGc5UM1+DvCDY4VIiONAgnJreJjeCtIULEBW7t3XTkNz+LPZLZTCZFrw/gQ0nzk9sJy5gCDjLGOdHlXHJ8cV8=,iv:EtEDniouuYzhFKWSbpfPDAC7Ph8dFcS1H6V++LyKcDk=,tag:RTCptzUWgxU36wjsxfngQQ==,type:str]
+    lastmodified: "2024-09-26T12:00:05Z"
+    mac: ENC[AES256_GCM,data:v2LBr7qzyIhjdLMhFiMkfvN9p0SG0LLqddhqd+o2xvEgZzJXfdYF7ccCct/C3mXF9gAYwrPqHg1kw75u79TMCyXgs/Axo+bBD5Hte46ETByX8bv+Ni0AlkCAr1PymvsqXQOLK5eO24DZVeYc1nSjGsQLpFPFAD8Ko2dGRaSDgVY=,iv:vD46s7c6ocAJ3AM8XuvJu/tJXlbR1svC3PHhxKnb/zg=,tag:V27Rbpa0Uxjpo9V+6kGRSg==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0
--- a/zones/chir.rs.nix
+++ b/zones/chir.rs.nix
@ -144,7 +144,7 @@ with dns.lib.combinators; let
    SOA = {
      nameServer = "ns1.chir.rs.";
      adminEmail = "lotte@chir.rs";
-      serial = 52;
+      serial = 53;
    };
    NS = [
      "ns1.chir.rs."
@ -246,7 +246,6 @@ with dns.lib.combinators; let
      attic = createZone oracleBase;
      lotte.CNAME = ["lotte-chir-rs.b-cdn.net."];
      status = createZone oracleBase;
-      sliding-sync = createZone oracleBase;
      weblate = createFullZone {};

      int =