diff --git a/hosts/tsuki/configuration.nix b/hosts/tsuki/configuration.nix index c4f92ce..9d0a52b 100644 --- a/hosts/tsuki/configuration.nix +++ b/hosts/tsuki/configuration.nix @@ -11,7 +11,6 @@ ./services/grafana ./services/headscale.nix ./services/hedgedoc.nix - ./services/invidious.nix ./services/kanidm.nix ./services/matrix ./services/minecraft diff --git a/hosts/tsuki/services/invidious.nix b/hosts/tsuki/services/invidious.nix deleted file mode 100644 index 56ddeaf..0000000 --- a/hosts/tsuki/services/invidious.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, ... }: let - cfg = config.services.invidious; -in { - sops.secrets."postgres/invidious" = { - restartUnits = [ "invidious.service" ]; - }; - - services.invidious = { - enable = true; - domain = "yt.nani.wtf"; - - port = 19283; - - # This will implicitly use unix socket - database = { - createLocally = true; - passwordFile = config.sops.secrets."postgres/invidious".path; - }; - - settings = { - registration_enabled = false; - host_binding = "127.0.0.1"; - # popular_enabled = false; - }; - }; - - local.socketActivation.invidious = { - enable = cfg.enable; - originalSocketAddress = "${cfg.settings.host_binding}:${toString cfg.port}"; - newSocketAddress = "/run/invidious.sock"; - privateNamespace = false; - }; -} - diff --git a/hosts/tsuki/services/nginx/default.nix b/hosts/tsuki/services/nginx/default.nix index c973d5e..d782cf9 100644 --- a/hosts/tsuki/services/nginx/default.nix +++ b/hosts/tsuki/services/nginx/default.nix @@ -47,7 +47,6 @@ "headscale".servers."localhost:${s srv.headscale.port}" = { }; "hedgedoc".servers."unix:${srv.hedgedoc.settings.path}" = { }; "idrac".servers."${ips.idrac}" = { }; - "invidious".servers."unix:${sa.invidious.newSocketAddress}" = { }; "kanidm".servers."localhost:8300" = { }; "osuchan".servers."localhost:${s ports.osuchan}" = { }; "plex".servers."localhost:${s ports.plex}" = { }; @@ -179,7 +178,6 @@ # ''; # }; # }) - (proxy ["yt"] "http://invidious" {}) (host ["h7x4-stickers"] {}) (host ["pingu-stickers"] {}) diff --git a/secrets/default.yaml b/secrets/default.yaml index 74b982b..36e09e6 100644 --- a/secrets/default.yaml +++ b/secrets/default.yaml @@ -20,7 +20,6 @@ drives: nextcloud: initialPassword: ENC[AES256_GCM,data:ROG+4u6C9zBu8Ez3Jprw8cgwVd2gFErUIOBmrWL9o7/qSGPT8jnwd0T5W8E=,iv:uRdL/3Xslu/J/aPI44WxlNw3RLAvjDRPt5VttuQL/P0=,tag:IDmGXNF9PsHPaMqK5YUKIg==,type:str] postgres: - invidious: ENC[AES256_GCM,data:r/Jzs7U1fkCi2j5L/tOcBfakR3virj8HGrDrVZdP7VwubG4BJLvoeb14eJo=,iv:3plNFOds+HeF0HAliedczpNgPL4ZgqhCOwqbnb2e8Ag=,tag:DHm/KM9UuPiqaRxqNDb7QA==,type:str] nextcloud: ENC[AES256_GCM,data:E1tD6Z2SDbi5TUDAACjXSJJIn+/ySu0+8xhvRVFxumxjex4ZsEw+mofKIxM=,iv:E4iPVF3M8GOoQghVQtn/kCEpXl0b8MueCbtyvzFM8AA=,tag:IF4kWOuTsylqrXMoXzQaVQ==,type:str] headscale: ENC[AES256_GCM,data:UVPCZjcpm9j2dMwyAvrPfwOj84JJHrwoU5rs672FEeA=,iv:zq3J4mL/PB3EAl8LHxxC77Y4FMrZWT4QF+DOih+FIGk=,tag:UwfjKnjfJ3a6RwAWg/8BzQ==,type:str] grafana: ENC[AES256_GCM,data:bsxzS/xkNdSJvOSQfZY8RRK03ckfKAoYeiZlgrSxXVqTEQ==,iv:wb8bFITgGLToagEczdm7MwUmXl3tyYmrYqSZOblEz0I=,tag:ZboMGI4QdmOK+LVBDCl2Pg==,type:str] @@ -68,8 +67,8 @@ sops: cElPYm5qK2lkTWZ1UGd6TU1NV2h4OTgK8Ecv58Ybnc6iYMjtSKTT1fYbNf4yyFgX rjQ2sU8Rqc04MqixnAkF2zSDaaJ0vqwf22MvbO3bYhpqOHwiTMbRLg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-06-09T14:08:08Z" - mac: ENC[AES256_GCM,data:78N+7s7fsx8joo5QBwpugJWQ5Qq4nUfUDnR/0GFlv2gO/uzVfx9yEwSXhZZpBTIU65HhHBQjk3LYRWRAdU19zSgm1dd2DNCt15OndaFeTtGit9s39g4ROZEAOUGTA7gFHbdg69owAVckLheTETaYybwVoGSqhcox4scTpXr+4WY=,iv:ZfB6+l/FOWyXginOHDBiPuBwUs32eghA0Wv78XSpotQ=,tag:9jKTrToXS5omlsHw5oSmUQ==,type:str] + lastmodified: "2024-06-09T14:08:52Z" + mac: ENC[AES256_GCM,data:+gz1Zp4cZ4k81mPVUSjBth/B7Dgc4urOAWmfN9p5qxUEXoiqY1TLImmqr1YGrQE7QHO0VzpEY1UJsDLayMFTQexnI9ePjaws9bJrHndR6wMcuDunyQ9iWgwU3CYPtvX8T4/5lTTswwiWaMRMHR9j3KB43VQ8p/DpMVrZBdGD3Mc=,iv:YRABwve5RYb4npW5eHrqjFDVhs+hq3a8fMueG6aKdD0=,tag:7/+fq26aB0i9+AJfNcuV5A==,type:str] pgp: - created_at: "2023-05-08T00:49:52Z" enc: |