cluster

commit b973b950b362395ba7904fb65839b8510ba69824
parent 0b8d27a7535f2c8c918feeee4b5597746585ee7c
Author: MTRNord <mtrnord1@gmail.com>
Date:   Thu, 17 Aug 2023 23:34:09 +0200

Fix pg config

Diffstat:
M
apps/base/forgejo/release.yaml
 | 
49
++++++++++++++++++++++++++-----------------------

1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/apps/base/forgejo/release.yaml b/apps/base/forgejo/release.yaml
@@ -30,7 +30,7 @@ spec:
                     - SYS_CHROOT
         signing:
             enabled: true
-            privateKey: ENC[AES256_GCM,data:mlxTEeQktLfnhl6JlzL5LE/jKb7kQbFZx/v7xr3bDO1JrEWl5tIVWyUfQ4YE9zyhDEs8YX/+3leBy0rwzPlokvNiLCRKVxdNvgYW1f2HZAxOeTTOVPSIhkswXdj2ZIHH5uPH7Sl9hzecxYZVKBOJ5+0Nz1OsGKtBaeqrB1Rmp3bNY2ag8Q+HKZ5bFfCi5KEdNX+L64ZJR/OcO/Wc9mci0LZe79nRzwIf6P1W3RryPlv13O+Qa1sSuix/8ri3bHqsiOJl41RL/4d73g8UIVODnqocZBY+rCMsgoygwFwjjTPFp9yQDJVxVNlWNOF4JEkzwTK7jPMpNhhHrx4W+lhbqLdRyJooECxuu0WbwKkvmpDRHsItTgEj+BqXWwKqFfbDGGV7M2yo0dpCagW5sP2jcysKVE1b+Aue4ewIb26spTVtquZBT2Yw9MtFa0csGnB5kfANM0IEEEcJW2jGLUpSXiPqDsufiR2Nwkkvz+NgS5bdXGhEQlf52kuMu67hXTKP/iBxgNdpu/wGfqfyKspdikSJkQPzGoDV6SFAgaqqzHL7lNTInRUQWqfx+l1rQATApuqMYknNu0jH1WwEr05c2dAWhag4c+F43aLPkweNsT26NEoR2mKrGTleBhwSyZiO7g54vbA3ZBGPt6wiBdj/7iYN+uKPt/fAQatYPUK1mU/zu5+be4qsSxf8uVmmEVlPfBPNIGiNgL3VX1IBb5H92LFjQIbtggra5ITLEGAhzZUMx4oRsVUDrQ66o1d0ipCAY05CsZM3oXJND1nwUauaqyb/f3BGSgp/dh+qKb9EvS5QntQ8uM017Hcgs0jjjFF0NIIq5hQA+Q5k5LunOs9gmf5FHS3OMtwiSI0haFwKfpzobsp1AcD20yRuEwVabz9WIvAfhnD4QKku5mlS6WbP6WxilNBAoqBrBu+kL6DNjNQv+sCT1IneW/BNKnQaJlDDe3irIs4M6AgU3jjTXwYCshJUJrB4IvICXl9+x5fmmuyWZChPGoP1/g==,iv:b7K3JAlkd6nnraRMLslq2CgqN0l2N/W/J64A/z7hpFk=,tag:o8LmIQNtu6VZvIQTk8MFnw==,type:str]
+            privateKey: ENC[AES256_GCM,data:LqhqEYF/pKPTrZF8oS5nBzutCxMuOFYrODvHJHvTqYgAiAPRVf0OtLgzy02bxvfN3iX5h6d8Y5HEfJCVG0GzPqgphJfPcrxXpw+9RFXMswpGutsqzvgZPT5ly9RYMKI/u6zBwrGszigyELXO6uvFIi/VAErg9ubK8/bGRn9DXngyC9BR1XyLQz7jiR1zFafhb33hiLAmK05UpaZnW6WTToZpcyVbezPtq1WetwLiaf1rG/Bt5qXVVJjXcmLmI2VY4MjDfyNLK1hm3LET8jvA8ld+LvR4phVvutmsXAkEWGj0u22poxzXaFj0FmH0r+qzV/KxWez/p1E4w/Wrs0MIjxTT/acriVcuM9Y9FB6XYQErQUBt9MM7B6u6nJAvzqJ01BFjC26KGSSxtjWdXnWpfAhBYeC66Gd3HVEtCG/PLDL0xKD0YiFfYT78WNIYp89k0Sjq0nREEBuLQd2+3Q3GDOLzT4kdDp7oTBU5n662f5rahaPGbAFG0oTfFzSYIb8YWeqp38CUoZLIRili+FdWxNcrzGLOD77G8Xm0I71UgpcDRLHnZwxNsvJtffaaU0Q+BW2nzoVlk7T9tMXWCXXvLUtaj2s01lK4DUNglSEyOmN4vrO/OWi4D8vONtidG7Fi8RGewefW73rmEflN9lUGb9Rs+N0bXBr5zyKoOXRp7y9ubQKL//XNNSaNa8xc5pOt3tL8WV0afBZ4c0XN6FZLHKei8z90ehQL+rR0E1jQKuO0SJJZbtOunw5UNWxhjOOxKtcqFt3GVfS08b5alY4/Qx93kJS0lwYpvulY5gyqo7+2u25WOKuTQCC2zuEKjCE2MOM0yRJGV+ReH5vnUwc760xtQx3Vva0iJQBVYmcj9o7Cn62oQ4A7RDQ/FF4z5MZyiAgNVLBb5HqwjuFC7t7ZL6niPTuPeDEKCHc8As8ryr6ZD8oaG65PmVnu3kiKaphlzLiCxA5783GZrQoOUgV2XMdZ/01hFLtaNn09n4izSsBaek/SI5Pz7g==,iv:EMmDKJFcHA0V+wzCckGBviFYU6yZV6j2d+iRKaz0Yww=,tag:Gmr6ZlDIZ/tZjEfM66ckZA==,type:str]
         memcached:
             enabled: true
         persistence:
@@ -43,22 +43,22 @@ spec:
             hosts:
                 - host: git.nordgedanken.dev
                   paths:
-                      - path: /
-                        pathType: Prefix
+                    - path: /
+                      pathType: Prefix
             tls:
                 - secretName: git.nordgedanken.dev-tls
                   hosts:
-                      - git.nordgedanken.dev
+                    - git.nordgedanken.dev
         gitea:
             oauth:
                 - name: keycloak
                   provider: openidConnect
                   key: gitea
-                  secret: ENC[AES256_GCM,data:ZHMQtFBdRsHcmmtjeTPOjC0s1Imh2FGslF4VbnSgTAE=,iv:InBrhwxrc8VhcLUk8KKLLyYJqFuyWu6Id2URuqiQwc4=,tag:0Eqqetie7reWzfwvoWbQQg==,type:str]
+                  secret: ENC[AES256_GCM,data:fQs+IXaqs3A01K/XEX5p4S7mMbWBq1G0pP9k3vbgHBc=,iv:SQY5NPCcqvvVjzlmLl9ct9YRga1JdekZ5j+UjERdUfU=,tag:tBlejTYSL1kughQAvvgVfQ==,type:str]
                   autoDiscoverUrl: https://keycloak.midnightthoughts.space/realms/Gitea/.well-known/openid-configuration
             admin:
                 username: gitea_admin
-                password: ENC[AES256_GCM,data:jqtfKY3/CsiiOYQbOrjfXfX2sEQSSbjRXRCjwf92J5azdWvAZBoKvi8BaUmI5kqpTKdqFkLLR+vEoJ9/h6JRJQ==,iv:Vq2BfWRepTMZQrtJi3r+ve0KJytqUhj9TmtznazzNn8=,tag:Qq6xCEbFHvhGHhwAEutMig==,type:str]
+                password: ENC[AES256_GCM,data:rqw5msWg2RtYQIwTdSQmkmb2bvt6ecE5IlGOSZHO4PCSdEGXKRBdjQlpprdVvX+2D0LSLXlroo16IS1XWx1Pbg==,iv:EsIn7Cz+K2DC8dtJI2kKrLJTxIWQ7ZysOfIuUcfyOGU=,tag:2SDglBy+6GhowYSjUqXzEA==,type:str]
                 email: ops@nordgedanken.dev
             metrics:
                 enabled: true
@@ -94,7 +94,7 @@ spec:
                     SMTP_PORT: 465
                     PROTOCOL: smtps
                     USER: ops@nordgedanken.dev
-                    PASSWD: ENC[AES256_GCM,data:+1ps0UDmh80R,iv:T7fR+KPT0iK74/0zEYObo/SjfsaACtHSzzC2IHfv7BM=,tag:yJUqDvblNLeaMYwRLEMuXA==,type:str]
+                    PASSWD: ENC[AES256_GCM,data:r91hn6p65iYL,iv:mL9SFDruo4b5QzTHj1X3tJcKJLOdKVW9M86Nf408JaA=,tag:y9lH8RG43QGRMVPcMO9cXw==,type:str]
         postgresql:
             image:
                 registry: docker.io
@@ -102,16 +102,19 @@ spec:
                 tag: 11.11.0-debian-10-r62
             enabled: true
             global:
-                postgresql: null
-                auth:
-                    password: ENC[AES256_GCM,data:SP7xUOCW9+Gi2ODSkKLbz6QR5VKh0Rwh8ZGjbjFzbOCEmdUSB4w1YxujqqegGJbF7XtV72qKm7jTujEWAzUzMw==,iv:iQlATCPLjm6JIHRFRhjRJ4ZPUO1TlM7Kz0sKHhlEF3c=,tag:g1jgn+wP4jqtq2G966ZpJw==,type:str]
-                    database: gitea
-                    username: gitea
+                postgresql:
+                    service:
+                        ports:
+                            postgresql: 5432
+                    auth:
+                        password: ENC[AES256_GCM,data:+WUmzbe4q7Aa58WJW9xjf/gjTNwosK02daY59lc9xeO+ulAL9SiG8IMU+omUxC2ehXdWg3RcUrnlU7U7+uYn1Q==,iv:Q/djXoMbQmRpK2/gHc6IMlGE5dNpUlS03oRe2ZTz2Dg=,tag:TrxIxyT8F2fjB7j+b+Z1tw==,type:str]
+                        database: gitea
+                        username: gitea
             auth:
                 database: gitea
                 username: gitea
-                postgresPassword: ENC[AES256_GCM,data:ZMZduAaedtfjTA==,iv:2OZP8QqM1KI2xRTFpkP0ZJX81Ar5TolxNU//0IoXJ3E=,tag:xVpmiSM7DB89o90Ki8kJ+Q==,type:str]
-                password: ENC[AES256_GCM,data:hZPwV3BZJtO0NCRv2A46voGadU9DiWSiOwN+biHh0mwjYlPBnpsuKPvhP2rI5vVUzemlAykEJPDKr0Lk0b1AIQ==,iv:MXOAcKZg+o6zvj0zkq1wC23tWh4Scd3t+Ye11IZGzUU=,tag:UFV/tRPfeMJyfpZoBC/Pjw==,type:str]
+                postgresPassword: ENC[AES256_GCM,data:lo+0ocNtFtuW6w==,iv:Xfy04BMJnOoS6ai/3UwEyzHy2epdyuDN0uPaX1kzgQk=,tag:Rebxt9QhP61dkKaXjAsQ0g==,type:str]
+                password: ENC[AES256_GCM,data:EmgBmUi9AZfqwGj0EXOfpKB9qS+XBhuQiE39jG5N211EBSaVY6UxFVGKwnpDt6dybfuEZCgwDMz90mAUtWNzYA==,iv:Twmz7YxPDWrbBkEy/xlmNSty34cd7LV2Tac3crxY71o=,tag:poZg4IeF3Yod96937oVWMQ==,type:str]
             persistence:
                 enabled: true
                 size: 25Gi
@@ -123,15 +126,15 @@ sops:
     age:
         - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
           enc: |
-              -----BEGIN AGE ENCRYPTED FILE-----
-              YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBicWNhaWhsNjYrUGZFYi8w
-              M21uTG5RVTMrS3pTeFQ2T2wwbVRQRERqeFI0CldpV3FmRG1zWS9XZVU2OTRld204
-              TnExa0VTVklSRW80aXlUYkV4QjNwbXcKLS0tIEh6TDkxbWV0Rlg2d2RhTDQ3dUFP
-              dldZNzlYSGk4VWxiWjRJY3ozWHA5NzAKgklAkwi3uwNc89io1Ptucrn30iHGOkD8
-              mU8hT+aIExROMmBT+7hak0OiiZ2CK5mUmZE+O+Fr3X8fy8LVKp4v4w==
-              -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-08-17T21:11:22Z"
-    mac: ENC[AES256_GCM,data:bsCPYJUw2+HINX2wLaPb5e45bQwGwQeXIKSR8t5yaFcEFLwspJUTIgvlVcvHjbbCVnx9r4999SVKCZ9xLwy3Ztqj/qBOwD2r2GaSGpbyht8vL5qhnq8OSxImzMDuD2AO0Tka6tcosTKMr7KH8QSCC8YMa5SmeMSTGa/Hkq0SAZU=,iv:bhZHXttVzejW43RHN7LLxfXh+NVmAOs497RKiw7Ht7s=,tag:8apH+niO2mN+8pwqZUhTqw==,type:str]
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArSVpTcjJheG5JMXJRejFK
+            RHNxYnljZFZwYUZXWi9qOHowLzJBZUd6S3pRCmtLbEw5NG1SQjZaaXB3VVhmSC83
+            alc2VGNOejZBMExtRmpoV2U2Z0orVFkKLS0tIFdsdjhZRUlkd2w4ME9aZThxY2Ez
+            djA2MWN3ZWYzWEdhV09CWVNqOTh3V0UKNwLgmXiOeYiujjGdhTfowwXjSPdoc8Xu
+            2r8MxgG7QkWkeep1/2Sk3TQvc3A0Q/BcoGgPVuRgoN4f1dKcg58EsQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-08-17T21:34:01Z"
+    mac: ENC[AES256_GCM,data:DruRjRVzmfuUwebTMAOCcFJl17v4y37RP3p/IycPTLhwUK+Lq/OVO7Ie0z0tmJVBj09B0ei8TqDlXfCyreu3qK69WZd65sINQJJ4QBVpIKlme2pmbvTAqZMRliQO+CQBIe05vRojgqH1sqcyu2TfWRLzAJi/r5xVs9AeFBaacpM=,iv:eRX15Zyy09A3E3i6cBSGyPiu+X9dghl8fVfu8z8WsHU=,tag:XWocAQENek6jz9KO8g086g==,type:str]
     pgp: []
     encrypted_regex: ^(privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret)$
     version: 3.7.3