cluster

Infrastructure files for Nordgedanken and Midnightthoughts.
git clone git://archive.git.mtrnord.blog/MTRNord/cluster.git
Log | Files | Refs | README
commit ed2e43d43da1c68d3599e7b474b9befa0c02e4c6
parent c2ceeaab80ad09518224004e327ce1860a615073
Author: MTRNord <mtrnord1@gmail.com>
Date:   Mon,  6 May 2024 13:57:34 +0200

Fix masto

Diffstat:

Mapps/base/mastodon/kustomization.yaml | 2+-


Mapps/base/mastodon/release.yaml | 42++++++++++++++++++++++--------------------


2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/apps/base/mastodon/kustomization.yaml b/apps/base/mastodon/kustomization.yaml
@@ -3,6 +3,6 @@ kind: Kustomization
 namespace: mastodon
 resources:
   - repository.yaml
-  - keydb.yaml
+  #- keydb.yaml
   - pvcs.yaml
   - release.yaml
diff --git a/apps/base/mastodon/release.yaml b/apps/base/mastodon/release.yaml
@@ -17,8 +17,8 @@ spec:
         externalAuth:
             oidc:
                 enabled: true
-                client_id: ENC[AES256_GCM,data:vuuS5E7fygvMH1nOn7vQHXhSWxgyXGU3bZQhKdni5mu31cp6/098tg==,iv:Eugk+KrIO4JcQPoUzeiQv/ycZ6a9mgoirWP4vM8y470=,tag:Pk/0CL465HpXlWf7xlSGzw==,type:str]
-                client_secret: ENC[AES256_GCM,data:eeq7TKB7KPFpOnkBNhMj82CDsqI5bxe0MbicIYqyl0THllqE800Ma1A8MlPfRm5Q8lgvAGua/+3uS8aWWDGAgwdh9j1cCPv7hgdyK2eYtnbDObLsTcOq9aXWCb/QKDV14Ox9peOJBI5u624/vWdntFEV0I5uFNvZCGwHI6EAKf4=,iv:9IeYnoMAZZL/NGfpH3bmYHqNrPTM/x9FXo/ufiCWQJA=,tag:Bp6GLdkthPHarT89sklxgQ==,type:str]
+                client_id: ENC[AES256_GCM,data:L6QP97kFlHX050TGgcu1aWudZzPRZDPgxZ7AQTqekqF0Z5wPES94tA==,iv:VTy2yONgfB5wtc4rtqeme0Pnm21u4COZLWlr4zYX1Ao=,tag:/KmjZ39kwsutP+nfzQkQ+g==,type:str]
+                client_secret: ENC[AES256_GCM,data:1v/infANaYNYOgw+YTNrpcC4yeyC17FsNNxmZ93maYcassp8HVHpBIGIXAJZjEHEnkn3Z0MW7ZVf1Z/MEt2cQbusrXZz2HucKbR7/XEdLomZlMJjqIIJjifvfxVwbczxhwOZGTyNGd5722NvR5QaOVNYl39HUEpeFhPiLrFHLvk=,iv:SxNr3PnJ5IHs2yjYYIvBIQ+mxvLrfjkIyLMLkH0Jg8Y=,tag:tS/nLY0BOg8xUShHETr+XQ==,type:str]
                 display_name: authentik
                 discovery: true
                 issuer: https://auth.midnightthoughts.space/application/o/mastodon/
@@ -57,15 +57,15 @@ spec:
                 system:
                     existingClaim: mastodon-system
             secrets:
-                secret_key_base: ENC[AES256_GCM,data:gWUxmzSPSSF+mz8BpeXg03nNV/G87RClHkFevWN6QJ3HouF1MaHhJRlbVAjhuds6s9GOuAZFzdgwBB2rCoD9TA8Jbr2RAiWBSjpJoEH7Tyiqb8LfvSjbmIv0wOz1E1426W9im9gkUo7w2XAyEFNC40XR7+Ras+KyGlFjErB1sMs=,iv:ALNEQTDdXr0JZubFWMx3pcXb34bFxb5LjjByJ74D9w4=,tag:oME/83Z09zgXWtsrTaVWxA==,type:str]
-                otp_secret: ENC[AES256_GCM,data:cfswS8t2U2zjCqnVKWKlDEwuVz3G8MeRX51mYVB0rTiVcr/a1aJG35dLjZg6xjBcKyGzdSv45lOkkHAZaGwsJov4suwnmUc9+Z0eFT17dpfuqpBWNdJa3U8Iz1YLnWuaKRANrtfymEKy3QkpqlQr0tW0FVz2lIw2ikW1RXxHWuQ=,iv:2dL9bqj7TsTZ0LHbWxGL9d9iwoSW7j5BHg3MBWiBH/4=,tag:SfqZsL+SAUeMDIWb+BYCYg==,type:str]
+                secret_key_base: ENC[AES256_GCM,data:MyZ7cFMG5jyEY+BHNQwQU6kput6lAuDscdfWkq2H075kp/lBiTGh9Dw4XBR4peIuCTaFRqMa5qoLFgdFyOJsJjE+JA7WFVvqQp9zLpoDh89YAyXkUtdzEAzmL/TB5YUCO6W8HH1Jk7GL/EoEoaOIUyV0X1Kd4w2iiBEJYL48V+Y=,iv:kHONBvydqwLphLSF3KNFmCVX2vkJ2e4UVfhhRQeAH0k=,tag:oJLYi1a1vMH7vIsrCA9wxA==,type:str]
+                otp_secret: ENC[AES256_GCM,data:FrPvK5WYae2LEx++4GfV9QHd8wt10b4jfEERU4eunKSUybq/3fICBgpDR86hxyvc8tqYs8mb5JlUa/jwlYoEyqIii28GG9p84P+OA4+/cjiW5S2x1Af26tzsMPBrBgvIeJxhkpSklqfSOoKdtxPqF2YAEoCbsA8z8XjP5mi+S8s=,iv:dMy9jCsdtV7GXvhkwyD4UGFpPpFcukmZcQqw4agCTr4=,tag:d7b81AKFhvL1yGFi6kV0wg==,type:str]
                 vapid:
-                    private_key: ENC[AES256_GCM,data:kP50XgfmtKLv7QfX7C11vtFwFyr/qeDjGBxEw3ft75zdL9XVXGC68A3829Y=,iv:8MCKyjSERmGXaA5JfU/bxRoHmLXfjayKmswnP+ey1do=,tag:3uZA06CwPjsU67JS4ANxYA==,type:str]
-                    public_key: ENC[AES256_GCM,data:fY6/EB4VGWMzBQwCVzDq9VX99Gp8p6TI24RGSjhgkSrt1fQG3ueBaUppooQCtDGjLYTa4BXHkO622zqN6BWYNY8fpvkT9Xjyc0vRK31T0WyV/otvFC4E5Q==,iv:y9rHT55ZU8bpa2oVYWsSfu9Jz/Ir5x1/utTGBUiCUeQ=,tag:HQEsI5NYHx4nFYE/nb80BA==,type:str]
+                    private_key: ENC[AES256_GCM,data:0hhngnJxGNNjscOZEwQc8WIVvRsiB3WSeWupEnIWGVbI5HcRkOC0QdMnCaw=,iv:G7Zgzy/8wSGuzqN8EUdcHLQ7nYTrCiGTqHfjZdZOGdc=,tag:Tac3RWKGBRWvSQtfpgaY6w==,type:str]
+                    public_key: ENC[AES256_GCM,data:mIcOBCa0zU26z9P7mTi2bFM1mezXYU3dJHf1vIfl0Szm6/1SSh1fSrUj7i8+fKShSWy7avrtA/iJEc0qB4//c+Mk2/QnFEUmKgxa0gjzZXfvt9Y61FU6WQ==,iv:TpSC8OqYec3G0C95ugoHZVFDtMOLYuAYNtO1FFJHIxs=,tag:4bQVwoGL1g3cQVIkk5BpzQ==,type:str]
                 activeRecordEncryption:
-                    primaryKey: ENC[AES256_GCM,data:EvD0pOYWxWK8oIgFOIv5SfRhjS6M5kxhhTU0i5kxV2fRC3HyKNL3XMaKffucAmVjDhaxmH6RrOL4J6sFUUceyw==,iv:Hd8UU3L2sH2JbH3ooaL06E2lLDqy5lZyrtYZJb+xqyM=,tag:8xyWw19Slby/9tDGjmGmcA==,type:str]
-                    deterministicKey: ENC[AES256_GCM,data:bcztuj7CW79AaoMlCaogzL3CQB8mPs/d9PHNhelp5xbX6dGy9jB02b0IKMxT7gNl1lKx/y4AZtoHYi/Pa2HbgQ==,iv:87ncCZKDeaYZCErJomtanJ6v4ceVF+inkQQyr4sG6rk=,tag:PcTYpflgn3QcCa00zzcMow==,type:str]
-                    keyDerivationSalt: ENC[AES256_GCM,data:M4xTLOfEh9Q0QEre3l3tnRMZMTMhUZA1MwX7YVAVEFybEaUR7dsHcvjmDBFz1Ctc9FgtCp+sWXU2U21XwPmH0w==,iv:CR9I9HqnvycO2X/W4B7varcVDOxx+2XoNsFcA914FX0=,tag:kXQ/BLuUwW9FVZj1r11fvw==,type:str]
+                    primaryKey: ENC[AES256_GCM,data:pSl2HcijJKGKhsD0xYNe1o9WUDu2TOuckXEsd1Wx1T0d9CndMUXbXS6yk9e+PB/g1Drk2pjkURWvntu/aaFHfA==,iv:UTn+oT+MScjWHAvBRfTDJzAyHnmb5cwuCuA2OxK34tA=,tag:P5p07DZi8Fb4Tukk0NsaSA==,type:str]
+                    deterministicKey: ENC[AES256_GCM,data:sIfceGBoGc6Hxjyr+RZSbaDitpOUUVfasOEkgJowoQwdolO1XWfgt1dM5Efoc7oiue91Wgtkcxx31F33KQCf/Q==,iv:P1MeVZUOtoj9ByPj5E73yxxLC6bE5NDxl61t44iD91M=,tag:5nyRCBEMRKSN2WFfMPUOzA==,type:str]
+                    keyDerivationSalt: ENC[AES256_GCM,data:qA/EnrWKcY9GTvUkZKJqNXrLrMrG1ncVazHx2zPxu+A6ffGso+pTwFvvsbBh0OhQehzgFnYGf21cw0GLaWoD4A==,iv:Xyc8zGTb9jyCz+q8TkyiUalCWvf++5dESLtI6mv9ISU=,tag:QNases+O8432Y1TM2r257w==,type:str]
             singleUserMode: true
             smtp:
                 domain: smtp.fastmail.com
@@ -75,19 +75,21 @@ spec:
                 server: smtp.fastmail.com
                 login: mtrnor@nordgedanken.dev
                 tls: true
-                password: ENC[AES256_GCM,data:1ZuRMOs1J9Wb,iv:O4Vdy+Kwh2qEZi62nwjZNRlW7gJW3b31BRd2BW4g/TU=,tag:Supd8/Qhg7QYQTv4yCpxZA==,type:str]
+                password: ENC[AES256_GCM,data:54t6Xa5r6N9r,iv:0bUcFxaHKvJbiR0RykGx/XTsFow+2cT9EWeC1LfR974=,tag:KLR8T+QHlNfoPL26DfGheg==,type:str]
             web_domain: mastodon.mtrnord.blog
         postgresql:
             auth:
                 database: mastodon
                 username: mastodon
-                password: ENC[AES256_GCM,data:ujIbdrFMVuZZXbxGbjXekwyzCT19X4zxAoau+NK1T13uFnLebSbIF69PGFXhk2AmQhqUW7BaTWNLnlegyYdXdQ==,iv:fvdw60Km9KZDAuBnff6F03a5yTKQef6wnjPW+cCj+k8=,tag:aqzeB3buYDYjOyHYdvoXuw==,type:str]
+                password: ENC[AES256_GCM,data:dgLh1Cf8p/iAYou7lqeSnZ1yxNSoK+qRFCVWlLEiN/f6MhuVI1EUAHxynM2S+s3NjtLSKJkMwDa+VfhmThOg5w==,iv:k+Oc4fRWOe30iImbInvghpdqmUICazMC/3CB2wwP29g=,tag:8+wZBRSNhL9uJ5Eiq1ZB4A==,type:str]
             enabled: false
             postgresqlHostname: main-ctrlc.postgres.svc
             postgresqlReplicaHostname: main-ctrlc-repl.postgres.svc
         redis:
-            enabled: false
-            hostname: keydb
+            enabled: true
+            #hostname: keydb
+            auth:
+                password: ENC[AES256_GCM,data:ygT205+3j+C2O1K4Z74TUccjMVAy0BDjOuC5gcs2YNK16YSVjMidViKjtMaHJNc8kPC3ptD7FijFFhUFzSKLgQ==,iv:p4ALlyK5nlYgMaYwbbgz5PhSagZzZ4rZfwr8CJg+RTk=,tag:TpUSPEL/WSTEk/s/GphMuA==,type:str]
         replicaCount: 1
 sops:
     kms: []
@@ -98,14 +100,14 @@ sops:
         - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqd1htYWNhc1huUFRicWlQ
-            TXRGVG5INXZFWlJ6bFZKYThXV1NKTHdQdXpzCjM2OHJ3R1RlR3JuSlNHZXpGeXE0
-            ZjNTME1pajZxcXhIK01wMWt4WURwekUKLS0tIDVZMGNaK1hsVjF3NkdnUnAxVUJ1
-            Rlp3enQ3T1lGZ2JYZWI4dW1EbFR5QlEKN12NDBln9397hvVvfIe93a183GBoyOjW
-            McULA2dtpAdcp589U7x1oluH4kblWhvYWQKmI7f4sfial+s1RYrYtw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGdVZhc1psZUhVZEhwTXJj
+            ZGE3ektndGRWUmRBYUZWVXp2VmRsRFVXVFdjClNLWlZ1NVZicHBDejArUWpCcS95
+            c25OVVdNaVJSS21Wblppc3VGaEMxUTQKLS0tIGN3L0ZLazhFbXJKYVhBNWZCRk93
+            bEVwL0JrMEI1bFlRYWJoUFAxb0tyNEEK+Lc6ERXBc/sS2EyiI8KOrIXlOD8d5Y4R
+            H0J3XmapOWlxZ1BB2ZDIkLy1AwOphwIYybn+ShxCD/fuwHEY/XNZLg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-06T11:36:23Z"
-    mac: ENC[AES256_GCM,data:28CQu/qTFOvdt2zpH0cTilbVqGVkCJwR3mdN8+tq9+qfMW5qN3nW4Ja1jDMzQB+3d1oshQGCVtqMAFshcyUzfmPpVU8xxHHQGjcs9MuVWs7UDK4HB4hWMqDsIL26H8d/CWc03MXimVVZegrx3h8rVycC5JWG73es+ccRNB2ekx0=,iv:AgaDHOrn+6s7Orpvjxh4hy1YLCYFxRv7z4GtRvfWRsQ=,tag:EMsg98zdLunMkHuNfdMIpA==,type:str]
+    lastmodified: "2024-05-06T11:57:30Z"
+    mac: ENC[AES256_GCM,data:qugVWL33OeT2nH4j4MwFWZemvnTZ/N7yviGACdYtWFXTWeTCGKDnm9WuQ3h8Yt3mr4opPQMstgwmTfuH5DiRHfyLLOfLHOKjJJm6JSIqlwufevU2CEpmVklamhboh7BDfHw1/ZvFTtISy9jcy188ESs927Aqd/YB+nLYyAicGYc=,iv:qBCR87UI+v3GCyO8dElNE6WMA7qMpgRYU9Ld2E7xXpQ=,tag:5Rbw2nioF0JN22Ri7oMB+w==,type:str]
     pgp: []
     encrypted_regex: ^(client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|PASSWD|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|adminPassword|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret)$
     version: 3.8.1