commit 9799bbba62ba065b7180746a3ace598ac996f40a
parent 482eb7bfd017526ae8e274e14ac8ad5af3d73a96
Author: MTRNord <mtrnord1@gmail.com>
Date: Mon, 10 Jun 2024 18:59:42 +0200
Fix clickhouse
Diffstat:
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/apps/base/plausible/release.yaml b/apps/base/plausible/release.yaml
@@ -19,7 +19,8 @@ spec:
values:
baseURL: https://plausible.midnightthoughts.space
disableRegistration: false
- databaseURL: ENC[AES256_GCM,data:g+N3EP35qdZZsyr9tP5kPz6xiDljGNhCYBm0WqSmVKejFee7+TAEi/tD1WNy+1OEXM8u/yLedy6koF0UtzrFTY5nxGL7Q6FTj6MTMAkOwyZ+soXXsI8nUGLwtqQJ3ixlDFIyq4CfMxye0VgjkLygy9vhHo4ddiOEvlUsYn2J2HwUfzr52xV3O+m+W8C90nvYi2AYAwvIL+M=,iv:JHrrvet7QcFqwteUye1dMv+jaPXhelq/RglZaBrNmh8=,tag:yZzlGM36j54s5UwwdiU0lQ==,type:str]
+ clickhouseDatabaseURL: ENC[AES256_GCM,data:SrIVmyFX+SsouvBT7rtoMnTeoXeBwpj26VwPOGY+TOtjO71JU6hrWjv0tyN1b16DNStOYdvrTjxNIUZEXG8h5w8NlT7XoMeAZaAR0dcdgXqwEbOP827cDQptfpB5rnt5WgzoXXXNH+MGabAnDRBvqX+ZWW22+Y2/RE9gnKKHpnlEJGvFgAFcQ16Bt/gWZ8us+AUlHIZcloseUYIW,iv:PCp0cPy/2blRrvJVyvFQUI/cipLzaVia1WexmRSln5A=,tag:lRhbyfl3yROKMsJFY5ES9A==,type:str]
+ databaseURL: ENC[AES256_GCM,data:9gZ3UxWSAf5I3awyMaMMb9qWSYRQPGtpb+kKYZ648ytqXil2wAhEGZIuG5XOqZlKRdiVNHJ21YerZ2gmvEELdlKIN/5bFJ/83jy4guNKsC65GKIwp7HksxeMDAmBDLAD6WFa3kk7H0PWzwOLYPQrTdRdZ8+gOY44V73JvLZVzUYF01QQ2lwkIBZGN/b6/KZInLFio0tiPRs=,iv:/vvN9pPF0GX3dLzlZSYZF/NLW5ylOOj3yLT3F7/ueuM=,tag:SikGmzxp0k7MRQq6gw6K+w==,type:str]
mailer:
# TODO: Set up mailer
enabled: false
@@ -27,7 +28,7 @@ spec:
enabled: false
clickhouse:
auth:
- password: ENC[AES256_GCM,data:NZU/EH8exntx/L7E5bl+mZKp8/F+UEd+MMOf9BH0NsStH4os6e+c+s1FZWXitt3Dn0PemfcNmtbntibsDaca0w==,iv:JlRCzIj7+vVUMS8OeOF60RYG4ERq2rHb2z+7/bW55O8=,tag:itohtI3wBqcERbYVAVejSw==,type:str]
+ password: ENC[AES256_GCM,data:ItS/u9kuZs8lXgQ+r4qX7XXbhDvTzp1utPnXNL5niJpuTOiN13n+xOEK4L5UNpz0nuPlaZjZwz3uvjTgQhCBTw==,iv:jVKcrQlaSpklefiW4NUObdFPtWlDM99XsjDgZydWR8Y=,tag:MJ0NokLHwjEw/pgYPwXfIQ==,type:str]
persistence:
enabled: true
size: 8Gi
@@ -51,14 +52,14 @@ sops:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOdTJxYnVyL28rWlJvZXJH
- NHA5ODRGRk10RG1uRy93THJGZEg1Uk5VdUc4CmVMZFhkekEzMkw0UGFZa1R4TGlu
- M1pPUlo4Z3dnT200KzhwcTYwRjZJYXMKLS0tIE1TeUZlTUh6OTNLY0NhY2pGVHF3
- eXBuUk1CRW5icFlNZlpzSXhDMWI1VmMKoKReE2IENQHOw5FsLqmHiODTCrehlAgU
- 2/NDxpc5Y3R2wLW9d9cxK2YavMNaj9cVyNysbX5ObkeZWypc6uCqpw==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjcTRMVVlvcnhsUE9NZHBR
+ Qkt3Unc2UnFjZVVhUW1WMkpxNzBkb1BldlVRCjY4L0ZSS3EycWhHU1FMVjA1VXFi
+ bGROdDJvMGwrWEQ3cWVJaU5waXNuOVkKLS0tIHJXVEd6VndIUzVnRUl5UTZtaEZk
+ NllZSEcxRllrKzI0NTlJQzdFdGFBZmsKFnEZNjuFNCzeQq41K4RDEUdteNEEp7uQ
+ prFzS3Wcqo4BF8Ophl3KBVAhdbI21mH637jaMN7szmqifSgZrc63TQ==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-06-10T16:50:52Z"
- mac: ENC[AES256_GCM,data:o7vqbGhqT0Ky5LoYsGI8dZpz3BJrInlEN3FZPAPCI0mvqxDGqz8nnxXYc7A3/q5faZ0XR1xAf5UfRfMmT60I17QQ5SJEdEjOFpVnJzy8yjAB9V/FsDQYx6hm6qINZihDrcRM9l9arStn+XLGItHs4+wIMzAkOfDPZs7dYNwUBFw=,iv:Qac6XqopyFlP9zWnEYu82ww3yIry2lyWycAG2Ksszcw=,tag:3dI+jmQuNd2ka4GJDguLmA==,type:str]
+ lastmodified: "2024-06-10T16:59:36Z"
+ mac: ENC[AES256_GCM,data:aSt1YHkSh5DWCYinTsuezzJKXUKLt74ZjSZaz0/9FJgZYWr2+aXFWG6diILxs4RocTsd4iFP3sISoWt+Y0YGoEGnT8cx0+pVVxq2caSwe0gklC7yMW7ve8Al3ALwJcHZLS/4idGjPuyfCXeygqZztSZQuZatGhJ7ZUd5vRi7Aic=,iv:XnJ38n2oA/ai+798q4Lmvc0MjANAepGxDvhsH6ky4qA=,tag:v25CW039iYlWFYHDPDclHw==,type:str]
pgp: []
- encrypted_regex: ^(databaseURL|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)$
+ encrypted_regex: ^(clickhouseDatabaseURL|databaseURL|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
diff --git a/decrypt.sh b/decrypt.sh
@@ -1,4 +1,4 @@
#!/bin/bash
export SOPS_AGE_KEY_FILE="$(pwd)/age.agekey"
-sops --ignore-mac --age=age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh --decrypt --encrypted-regex '^(databaseURL|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)$' --in-place "$1"
+sops --ignore-mac --age=age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh --decrypt --encrypted-regex '^(clickhouseDatabaseURL|databaseURL|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)$' --in-place "$1"
diff --git a/encrypt.sh b/encrypt.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-sops --age=age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh --encrypt --encrypted-regex '^(databaseURL|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)$' --in-place "$1"
+sops --age=age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh --encrypt --encrypted-regex '^(clickhouseDatabaseURL|databaseURL|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)$' --in-place "$1"