From a20be8b312b653a1b0d5da0c2ccf4d65fc8ed811 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 23 Mar 2022 17:50:43 +0100 Subject: [PATCH] okarin/sbruder.xyz: Migrate services to renge --- machines/okarin/configuration.nix | 4 ---- machines/okarin/secrets.yaml | 5 ++--- machines/renge/configuration.nix | 4 ++++ machines/renge/secrets.yaml | 5 +++-- .../0001-Prefer-opus-audio-streams-in-listen-mode.patch | 0 machines/{okarin => renge}/services/invidious/default.nix | 0 machines/{okarin => renge}/services/libreddit.nix | 0 machines/{okarin => renge}/services/nitter.nix | 0 machines/{okarin => renge}/services/sbruder.xyz/.gitignore | 0 machines/{okarin => renge}/services/sbruder.xyz/default.nix | 0 machines/{okarin => renge}/services/sbruder.xyz/index.md | 0 .../{okarin => renge}/services/sbruder.xyz/metadata.yaml | 0 12 files changed, 9 insertions(+), 9 deletions(-) rename machines/{okarin => renge}/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch (100%) rename machines/{okarin => renge}/services/invidious/default.nix (100%) rename machines/{okarin => renge}/services/libreddit.nix (100%) rename machines/{okarin => renge}/services/nitter.nix (100%) rename machines/{okarin => renge}/services/sbruder.xyz/.gitignore (100%) rename machines/{okarin => renge}/services/sbruder.xyz/default.nix (100%) rename machines/{okarin => renge}/services/sbruder.xyz/index.md (100%) rename machines/{okarin => renge}/services/sbruder.xyz/metadata.yaml (100%) diff --git a/machines/okarin/configuration.nix b/machines/okarin/configuration.nix index e31a93c..0e5a7d7 100644 --- a/machines/okarin/configuration.nix +++ b/machines/okarin/configuration.nix @@ -6,10 +6,6 @@ ../../modules ./services/ankisyncd.nix - ./services/invidious - ./services/libreddit.nix - ./services/nitter.nix - ./services/sbruder.xyz ./services/torrent.nix ]; diff --git a/machines/okarin/secrets.yaml b/machines/okarin/secrets.yaml index f9dca8d..927bb79 100644 --- a/machines/okarin/secrets.yaml +++ b/machines/okarin/secrets.yaml @@ -1,4 +1,3 @@ -invidious-extra-settings: ENC[AES256_GCM,data:PVdEqmWBvz72Knq0K/oZMfC4f4ygib7QJ4tMua4CeeSFchQirD3bhHKEPxfzJ5KxIZwH3otLjB8wAFJ+fDCQsrf5owJwP+4gxPFjlpk3nFiB,iv:Q0Lmr9ZO5ijIZ4sDNo5YollD6DaHN56RyV8MJgNctHI=,tag:5W3euSI7OPJ0BYvrEZjH+g==,type:str] murmur-superuser: ENC[AES256_GCM,data:yPiP2Vh6Zf9OSy0hlP0DsNykbhR2VvCLzA==,iv:+GEChmJtE2bnQ35uke4QXRDO3vY3MVPz2rWDwN6EUYI=,tag:paqTIe97dF83ExwAoQnSlQ==,type:str] wg-home-private-key: ENC[AES256_GCM,data:UMNY28f8D4VN86s8RqhBbfCgBzLWOmAu1Id7RyIfp1Ta/BvgtfOz70Y3hvs=,iv:ph2O/wBwwThHnNQ5sHIc9ZOC6EXHM3fv4z3esTpJuj0=,tag:pROjuUte4+OZxPlhppceWA==,type:str] wg-qbittorrent-private-key: ENC[AES256_GCM,data:PIoaHruI5+jnhXx7qaB16Xc7XV9xow2lhQy2/ILVhjwt5G2CN3CpfYQKep4=,iv:ZIoKe0FEwaJD850EUcnqQqC5Jg9FtqNin+1wdN6iQq8=,tag:0YveFfJlhgU0Z3kxrSMSQw==,type:str] @@ -8,8 +7,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-03-23T16:04:42Z" - mac: ENC[AES256_GCM,data:rzDazgZLtvLtl84pOAebiHWtiSi59r9Y752klDdGOyR15yS/PeVJiHV4gPa4HFfcQofl7tGAAgq2YO15/V8U5gEx7DYkoEt62rTgbsZZp0G6gWklCZzi8GlVwvcUOUhbULoUTvqaUm5pqeXYyOcSuIgwMnqUVe6STVd2jKOpkmQ=,iv:YcEElKcrZjoRTo37c2gShnbUv1xjlq6prjn2FT9t/QI=,tag:O4JNXeJ9xbjJtTJEECUHtw==,type:str] + lastmodified: "2022-03-23T16:43:39Z" + mac: ENC[AES256_GCM,data:xD6GnHsyMe1nmgoYKpUxq6O45zpAKTfUFO4m7qHRTlfrEPmIkC8DoENb+qbhT2fHpvFAMEhP0IvhGoQUTcdhROIacEVQFuBpoVfNgNmMaDqvK4nB3XT2fGv1Z5tPDwPYFyxJ5Ashzp5iGPzrkBomZxCkT104b25sC441s8R3Sik=,iv:KkkV/y+ATd26O/357vpSm0ZchNz+pIPcZf+dYFpK1EI=,tag:HYtHaKxrWN1i9eP972SWYw==,type:str] pgp: - created_at: "2022-03-03T09:13:41Z" enc: | diff --git a/machines/renge/configuration.nix b/machines/renge/configuration.nix index dab4d0d..997a9d2 100644 --- a/machines/renge/configuration.nix +++ b/machines/renge/configuration.nix @@ -5,6 +5,10 @@ ./services/gitea.nix ./services/hedgedoc.nix + ./services/invidious + ./services/libreddit.nix + ./services/nitter.nix + ./services/sbruder.xyz ]; sbruder = { diff --git a/machines/renge/secrets.yaml b/machines/renge/secrets.yaml index c8bb2bb..b8238fc 100644 --- a/machines/renge/secrets.yaml +++ b/machines/renge/secrets.yaml @@ -1,4 +1,5 @@ gitea-mail: ENC[AES256_GCM,data:593Ks8r3W6i7oTsTu7d9NUQpeX64l2bU9/fo6jYHkPU=,iv:NLPh2B85CWmr9n8mbB/XrprG8kfu9AR3v8PqjgEsIjQ=,tag:q2fPoOtuFrEmXIe7Rvfj2Q==,type:str] +invidious-extra-settings: ENC[AES256_GCM,data:njAVRilLVlNLgFY5g0FMn7uZsSX3mWK8PnWW/oJoaUj7L0g597eRmL76LfvScz6+pbSYaY2H2Olt+YL0LWY0jt+gM0+FwG2+0ddrtrpjGeGa,iv:rNwvSV9YXqnQqNtzW79hEUKx6c0rddEcC31EVE7qr3w=,tag:iGiDNj5zDHXiO+mhmAwK4Q==,type:str] wg-home-private-key: ENC[AES256_GCM,data:j+L7Egy3coCajL/LBGcaEbN3WuFzj7aenEQoktcIeKOTMmrA4643bCSDuUE=,iv:gKJQfrMMaeF2muJhtfq0h/GJ7VXGk1axGPtRFccLhHc=,tag:Bsqe3QBNdXo8vWo1p9pxfw==,type:str] sops: kms: [] @@ -6,8 +7,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-03-23T16:04:48Z" - mac: ENC[AES256_GCM,data:yi2hWnP2mJg+ARzqnA37jxdbHvTeAZVmAdt5f+IosixJ2ZzQING01i1jjo7E7cwPNKeSlC4uDciH7V7HJqjjWPMmTYPwJLco0Rcf+zPY6T+64BDhEtIKf3/fyYZ7Qwpi1PsEfVq7AJapBzb1+HFsoRKX0ho/9qQEcukhsdhKSgo=,iv:9RZX15ji3u93bWuWvDNl50mc5THh7G/hyRerApv8RzM=,tag:WR8+VeKOGV/uw0VsUqwvpw==,type:str] + lastmodified: "2022-03-23T16:43:51Z" + mac: ENC[AES256_GCM,data:D3HnEDwmJPue8Fes3tZ8R7AsjORJyc+l1/AI308DE4OUCs/551xgwpkd9h3w/WiMfSE70oAQRCeyCy50fKsLvlVIEy7R5EZGXidQfV+USFvqCExfiGzzn4Yn/cMgG7P7eyV6hWFZMtU/qWcaQxL8mLRdXxknkMu2UmqRjhZX2sI=,iv:rzbPVa+ja1KxkXqdD9ciHglArXaPfD8c99bw5mYqc6o=,tag:g8B169qyDGmwROeh79rQ1g==,type:str] pgp: - created_at: "2022-03-23T13:59:53Z" enc: | diff --git a/machines/okarin/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch b/machines/renge/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch similarity index 100% rename from machines/okarin/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch rename to machines/renge/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch diff --git a/machines/okarin/services/invidious/default.nix b/machines/renge/services/invidious/default.nix similarity index 100% rename from machines/okarin/services/invidious/default.nix rename to machines/renge/services/invidious/default.nix diff --git a/machines/okarin/services/libreddit.nix b/machines/renge/services/libreddit.nix similarity index 100% rename from machines/okarin/services/libreddit.nix rename to machines/renge/services/libreddit.nix diff --git a/machines/okarin/services/nitter.nix b/machines/renge/services/nitter.nix similarity index 100% rename from machines/okarin/services/nitter.nix rename to machines/renge/services/nitter.nix diff --git a/machines/okarin/services/sbruder.xyz/.gitignore b/machines/renge/services/sbruder.xyz/.gitignore similarity index 100% rename from machines/okarin/services/sbruder.xyz/.gitignore rename to machines/renge/services/sbruder.xyz/.gitignore diff --git a/machines/okarin/services/sbruder.xyz/default.nix b/machines/renge/services/sbruder.xyz/default.nix similarity index 100% rename from machines/okarin/services/sbruder.xyz/default.nix rename to machines/renge/services/sbruder.xyz/default.nix diff --git a/machines/okarin/services/sbruder.xyz/index.md b/machines/renge/services/sbruder.xyz/index.md similarity index 100% rename from machines/okarin/services/sbruder.xyz/index.md rename to machines/renge/services/sbruder.xyz/index.md diff --git a/machines/okarin/services/sbruder.xyz/metadata.yaml b/machines/renge/services/sbruder.xyz/metadata.yaml similarity index 100% rename from machines/okarin/services/sbruder.xyz/metadata.yaml rename to machines/renge/services/sbruder.xyz/metadata.yaml