From 66994eefa63a7d694852437d36291e3502acb3b8 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Thu, 3 Mar 2022 12:38:32 +0100 Subject: [PATCH] okarin: Migrate invidious from yuzuru --- machines/okarin/configuration.nix | 1 + machines/okarin/secrets.yaml | 5 +++-- .../0001-Prefer-opus-audio-streams-in-listen-mode.patch | 0 machines/{yuzuru => okarin}/services/invidious/default.nix | 0 machines/yuzuru/configuration.nix | 1 - machines/yuzuru/secrets.yaml | 5 ++--- 6 files changed, 6 insertions(+), 6 deletions(-) rename machines/{yuzuru => okarin}/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch (100%) rename machines/{yuzuru => okarin}/services/invidious/default.nix (100%) diff --git a/machines/okarin/configuration.nix b/machines/okarin/configuration.nix index 7faf7b7..e3a310b 100644 --- a/machines/okarin/configuration.nix +++ b/machines/okarin/configuration.nix @@ -5,6 +5,7 @@ ./hardware-configuration.nix ../../modules + ./services/invidious ./services/libreddit.nix ./services/sbruder.xyz ]; diff --git a/machines/okarin/secrets.yaml b/machines/okarin/secrets.yaml index 8d90dd5..3fe94f4 100644 --- a/machines/okarin/secrets.yaml +++ b/machines/okarin/secrets.yaml @@ -1,12 +1,13 @@ wg-home-private-key: ENC[AES256_GCM,data:UMNY28f8D4VN86s8RqhBbfCgBzLWOmAu1Id7RyIfp1Ta/BvgtfOz70Y3hvs=,iv:ph2O/wBwwThHnNQ5sHIc9ZOC6EXHM3fv4z3esTpJuj0=,tag:pROjuUte4+OZxPlhppceWA==,type:str] +invidious-extra-settings: ENC[AES256_GCM,data:PVdEqmWBvz72Knq0K/oZMfC4f4ygib7QJ4tMua4CeeSFchQirD3bhHKEPxfzJ5KxIZwH3otLjB8wAFJ+fDCQsrf5owJwP+4gxPFjlpk3nFiB,iv:Q0Lmr9ZO5ijIZ4sDNo5YollD6DaHN56RyV8MJgNctHI=,tag:5W3euSI7OPJ0BYvrEZjH+g==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-03-03T09:03:36Z" - mac: ENC[AES256_GCM,data:dAqEAQhYajKe1W65vjwtLGZxMBaxIpGrTfgrUCjNR/t3en7MQblmr1a6kCKG2KEYqv48H3RxUDO5YYk1hV5YUdNBrDKKi0SUgEToxhwoeJ4lazYdFUmH4yD0NrwuZNQD1HA7H2RO9TSkNm/9LfLESAgjSTTjNjOlL/+r6T53g8Y=,iv:8HHu0RRlLNWUM7GQ4XT4djNG4khzr/HXQS3KLm558IA=,tag:gu3WdtFfHIcvO5Mxyg/3QA==,type:str] + lastmodified: "2022-03-03T11:21:51Z" + mac: ENC[AES256_GCM,data:Kmt4fa/ECXPzZf7JEazW8OtWRv6TbPuA+RHaNFvqR+UXdJ6Tr/6xLnJlgsuH9RoSyP1OLnv1K5JOeoKHkDvHJkB/bXBNLqXAixBZvZd1kuA3LHDR27n0gT8STACPvYCJTL3FsgVCDaIB9fpggInjk811Q075NGaE8o80mYJVpG8=,iv:6wNHT6M/u0cyyypl951Qja4pRteKIYFyoA8uK1NVCm8=,tag:kOCVWef7wY9TkhovGynFpQ==,type:str] pgp: - created_at: "2022-03-03T09:13:41Z" enc: | diff --git a/machines/yuzuru/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch b/machines/okarin/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch similarity index 100% rename from machines/yuzuru/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch rename to machines/okarin/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch diff --git a/machines/yuzuru/services/invidious/default.nix b/machines/okarin/services/invidious/default.nix similarity index 100% rename from machines/yuzuru/services/invidious/default.nix rename to machines/okarin/services/invidious/default.nix diff --git a/machines/yuzuru/configuration.nix b/machines/yuzuru/configuration.nix index 6ab28c6..ee8480e 100644 --- a/machines/yuzuru/configuration.nix +++ b/machines/yuzuru/configuration.nix @@ -5,7 +5,6 @@ ./hardware-configuration.nix ../../modules - ./services/invidious ./services/nitter.nix ./services/schabernack.nix ]; diff --git a/machines/yuzuru/secrets.yaml b/machines/yuzuru/secrets.yaml index d61a5ca..459d8f3 100644 --- a/machines/yuzuru/secrets.yaml +++ b/machines/yuzuru/secrets.yaml @@ -1,4 +1,3 @@ -invidious-extra-settings: ENC[AES256_GCM,data:sWvf8ASNUTmdRj9HTsXCkPDg0yQ+Hc+ddnHst72pGBKq0403o5erMzudPm5TVvTEzHeeNDB5d+lTt760s6S2diUMc8l/k3G8Z9loYf0Dpx7o,iv:vqyzZ2B4WQB7AmGDp64nu+Xi+6Jxm6m7D3SUfYq0DZs=,tag:aeQQLerfBEjkpi1NW1x2jw==,type:str] wg-home-private-key: ENC[AES256_GCM,data:KIUvsIhz2Rc4uHRQla714xfOxL9ke1WzRAbXVTDd6UyNkYQkuYIxIpmXQw4=,iv:usnONR35DtIVH2CV4tGSBz5FsZyMlEDzSQiYLDQLRnw=,tag:M1V4HhtByXogMacjajl1iw==,type:str] sops: kms: [] @@ -6,8 +5,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2021-09-08T16:21:04Z" - mac: ENC[AES256_GCM,data:8Q52a8+6mO/LCjNR7yo4olqz8fJIqus7XUZ6FtRzzlEGeYvkBD6zFuz0QJBUl8gRtmj04tQWUn4fEKz8LApSluHXHoBv4/WVBNm/vL9T2k7SiAJmxhbU5wZmNt+Hg++Kvn8yZ6KXgpG6KVl5qu+/CHuJu2m39AvpTj9NJ+ThCUc=,iv:r037pF9rVUqe87+D7pVjxqgFM/hFALSWHFx8kB/fXFk=,tag:GsA95+KyajrKb5XMpVOB2g==,type:str] + lastmodified: "2022-03-03T11:42:01Z" + mac: ENC[AES256_GCM,data:WDFDnF+bsB72n13Udh9SRsQH0l9lhLozceze2tF/RDKYY+T0CHwkAkSOqeUhL6Euasp2pQuapCrwWT9jyd9XfbwlWgnSUgy4TFIQtiS++dHsUfq69Z9y4gLeY7vQLWVcW3CVVX0Tg61iwihEdd49ARsTre1livvgE33glwcz6O0=,iv:2THxHyoq6qNMzd2LObfUSXMU2KakPXQK5ta+4D9jSBw=,tag:usug6AqI5toJ8VHvIQxGGg==,type:str] pgp: - created_at: "2021-09-08T16:11:14Z" enc: |