More pre-commit logic and fixes

2024-10-30 13:35:38 +01:00 · 2024-10-30 13:35:38 +01:00 · f0e56e916e
commit f0e56e916e
parent 5e0342ffd1
10 changed files with 201 additions and 103 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -7,10 +7,25 @@ repos:
    rev: v0.13.0
    hooks:
      - id: yamlfmt
-        exclude: '^charts/|^secrets.*'
+        exclude: |
+          (?x)^(
+            .*secrets.*yaml
+          )$
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.4
+    hooks:
+      - id: codespell
  - repo: local
    hooks:
      - id: check-sops-secrets
-        name: check-sops-secrets
+        name: check sops secrets
        entry: ./scripts/sops_check.sh
        language: script
+      - name: check unused values (disable by setting DISABLE_ADDITIONAL_CHECKS=1)
+        id: check-unused-values
+        entry: ./scripts/find_unused_values.sh
+        language: script
+      - name: lint helmfiles (it might take a while, disable by setting DISABLE_ADDITIONAL_CHECKS=1)
+        id: lint-all-envs
+        entry: ./scripts/lint_all_envs.sh
+        language: script
--- a/.yamlfmt
+++ b/.yamlfmt
@ -0,0 +1,2 @@
+formatter:
+  retain_line_breaks_single: true
--- a/installations/applications/helmfile-badhouseplants.yaml
+++ b/installations/applications/helmfile-badhouseplants.yaml
@ -91,6 +91,7 @@ releases:
      - template: ext-traefik-middleware
  - name: server-xray
    chart: allangers-charts/server-xray
+    installed: false
    namespace: applications
    version: 0.2.0
    inherit:
--- a/scripts/find_unused_values.sh
+++ b/scripts/find_unused_values.sh
@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+if ! [ -z $DISABLE_ADDITIONAL_CHECKS ]; then
+    echo "Check is disabled"
+    exit 0
+fi
+# -- Get all the envs from the current helmfile installation
+ENVS=$(yq '.environments | keys | .[]' ./common/environments.yaml)
+
+ALL_VALUES=$(find ./values -type f)
+
+USED_VALUES=""
+for ENV in $ENVS; do
+    USED_VALUES="$(helmfile --log-level error -e  $ENV build | yq '.releases[].values[]'):$USED_VALUES"
+    USED_VALUES="$(helmfile --log-level error -e $ENV build| yq '.releases[].secrets[]'):$USED_VALUES"
+done
+
+UNUSED_VALUES=""
+for FILE in $ALL_VALUES; do
+    if [[ ${USED_VALUES} != *"$FILE"* ]]; then
+        UNUSED_VALUES="${FILE}\n${UNUSED_VALUES}"
+    fi
+done
+
+if [ -z "${UNUSED_VALUES}" ]; then
+    exit 0;
+fi
+
+printf "\n ** There are unused values in the repo ** \n"
+printf "${UNUSED_VALUES}\n"
+printf "Please remove them from the repo to keep it clean"
+exit 1
--- a/scripts/lint_all_envs.sh
+++ b/scripts/lint_all_envs.sh
@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+if ! [ -z $DISABLE_ADDITIONAL_CHECKS ]; then
+    echo "Check is disabled"
+    exit 0
+fi
+# -- Get all the envs from the current helmfile installation
+ENVS=$(yq '.environments | keys | .[]' ./common/environments.yaml)
+
+
+FAILED_LINTERS=""
+for ENV in $ENVS; do
+    if ! helmfile -e $ENV lint; then FAILED_LINTERS="$ENV\n$FAILED_LINTERS"; fi
+done
+if ! [ -z $FAILED_LINTERS ]; then
+    printf "\n\nSome env can't pass the linter:\n $FAILED_LINTERS"
+    exit 1
+fi
+
+echo "The linter is happy"
--- a/scripts/sops_check.sh
+++ b/scripts/sops_check.sh
@ -1,8 +1,18 @@
 #!/usr/bin/env bash
 set -e

-for secrets in $(find . -type 'f' -name 'secrets.*');
-    do sops filestatus $secrets;
-done | grep false && \
-echo "There are unencrypted secrets in the repo" && exit 1 || \
-exit 0
+# -- Default exit status, that should be thrown
+# -- when all the secrets are encrypted
+EXIT_STATUS=0
+
+for secrets in $(find . -type 'f' -name 'secrets.*'); do
+    echo "Checking ${secrets}"
+    STATUS=$(sops filestatus $secrets)
+    if [[ "${STATUS}" == *"false"* ]]; then
+        echo "ERROR: Found an unencrypted secret: $secrets"
+        EXIT_STATUS=1
+        sops encrypt -i $secrets;
+    fi;
+done
+
+exit "${EXIT_STATUS}"
--- a/values/badhouseplants/secrets.server-xray-public-edge.yaml
+++ b/values/badhouseplants/secrets.server-xray-public-edge.yaml
@ -1,37 +1,28 @@
 files:
-  config:
-    enabled: ENC[AES256_GCM,data:p4721g==,iv:Zp+m3P6vawpAdXO59bPcdgHvExuoZI480+4eg1zuFU8=,tag:C/SF9jbfLIMhJFXPEEBEFA==,type:bool]
-    sensitive: ENC[AES256_GCM,data:TJmIDP8=,iv:6OjVWwCxQETvi7uJkme/PzBEvyZ4AXlN3E+1IG+Gaqs=,tag:+oBak+FpBozTKthhPEyD2w==,type:bool]
-    remove: []
-    entries:
-      config.json:
-        data: ENC[AES256_GCM,data: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,iv:vxGxZsEDNanMqIFjb7aPGnZryfcxPam/GxL+a6GF5vg=,tag:F/+BnrZsnvseYup2I5rOgg==,type:str]
+    config:
+        enabled: ENC[AES256_GCM,data:KFvSrQ==,iv:PzI4x8KrwBBNr9ZQaU3CXzTQM2K248eLMBYBFmwYZgA=,tag:SyfGmYGB/ir413slfyOAfw==,type:bool]
+        sensitive: ENC[AES256_GCM,data:ylBUZtg=,iv:k2TEreAA+8zxlDxCBDB780ZzT/zHz2nsH2AUO7oOmgs=,tag:26AiIQ4iv3x3W+wUACwkMA==,type:bool]
+        remove: []
+        entries:
+            config.json:
+                data: ENC[AES256_GCM,data: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,iv:J7rPPMkSL3U5N8fRTcEQ8VRo+j8wnd9K/5XNLzHrU1A=,tag:dYvBZ2aNGt1Pk6wK6pcKjA==,type:str]
 sops:
-  kms: []
-  gcp_kms: []
-  azure_kv: []
-  hc_vault: []
-  age:
-    - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
-      enc: |
-        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXbGxtdGhLdlUxWXFjL2oy
-        SEtwa09CMG1JN1M4ancrUHB1VFhzNURGYzNRCkhyWEszT04yeEdSeFFqdWNheVEy
-        U2lFcFJxRDNlZ092cXNqcFJISTlHTGcKLS0tIG9PYXJ6MnJLMkF6VC9pVU1kV09p
-        Z0hlQVE5YWVMTGVqenFlMENsVElWeDAKhr01CynUWRMGp1G1J4CGVnV6A8Sa/TWc
-        o6NZUQ1eJmEzewpQCTa9NBA3KSU2/72oLUb5bVqhnUZuwn1V+awfAw==
-        -----END AGE ENCRYPTED FILE-----
-    - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf
-      enc: |
-        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzSllTdmZrZE1tZ1RZaThy
-        d2xSNUFubGExZnhCckF1d1pSaGFNMTZmZGxnCmFVNURzZ2c5U1ZXMFlQTkdXVER6
-        RkpEeHcwUXA1OWlWV3Q1dWxGOGsvcEkKLS0tIGoxSld2dFdZS3YrTW5rYUJKeUQx
-        T0FxVS9NUnlHRkREMDlWU0FIaU41OW8KbC8FSQCD2kxviuClUY7gdlwQWmSJ8T/3
-        pYh5CZGeAvBbB0jVWJutg9uR3H8KRxUPj3Ietn6342dUa//JV4lqVg==
-        -----END AGE ENCRYPTED FILE-----
-  lastmodified: "2024-10-14T12:38:17Z"
-  mac: ENC[AES256_GCM,data:+jU64zcEw5/WEgRzzJ+gfInkkV+QCtvy7OUbKS2OVE2wMHLxzpGPDOToE/A+kBGyjfFX3aMsbZktn1mE9AB+IjqzaoDGqWyZnP/sPaxqiW6tFLC1vNbgFnGHMa30+yuR2ClKsq8RlKZDxdStcTxtpT230XcKtQeVZGRL2OZoBHM=,iv:7sSepeSiriMkcNChdPjLkiEZaw43nVric4/UKylcJJs=,tag:gRF1QVQbRE5Q58G5qM4GHg==,type:str]
-  pgp: []
-  unencrypted_suffix: _unencrypted
-  version: 3.9.1
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuZFhCcUVLbkJaeFpZS01h
+            M3BDalBwWUxOVm5IVkZtU0ZhSnlTSkdpV1N3CkFnWS9HdjNnQi9WcytNaXA4WjF1
+            aTFsUmpKbERaVDRERlNQRmNVZENTSjQKLS0tIDB1Uk5iY1Z1Y2s5Sm16Y2JGSWI3
+            Zm1Hb2l1cU1uQXd1cW8xZHlhTzkrZ2sKukSMKHaiGlZyKtF7tvZNviuD8aqe2Bc6
+            uHcJUdEz+8ZLu20D9n/vk7y3Kyzqilv+V61lU6dFreMsX6N5F1aO1w==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-10-30T12:14:23Z"
+    mac: ENC[AES256_GCM,data:t2v/A2Rj6pBZEtF1lXSk9cFKcpDyCmttbMqthlo7as6PGAylh1dq3Yylh5z3PgOogGlSOLtaI2iwD0HpkV8cgABxx4RwJ93pX6rWZd5UNL5zC/na6gZJufwqt/LZUBQ+ZeN6QYiBDB5P7pOiQdaA+YEg8HabSgHXidpJasMVynA=,iv:+8NzhxP/D9yomND5ZJAYvxjfCNoqAH2Y2HOTcDw4Wcc=,tag:XcXRterzuZWWSjx8am5jOw==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.1
--- a/values/badhouseplants/secrets.server-xray-public.yaml
+++ b/values/badhouseplants/secrets.server-xray-public.yaml
@ -1,37 +1,37 @@
 files:
-  config:
-    enabled: ENC[AES256_GCM,data:p4721g==,iv:Zp+m3P6vawpAdXO59bPcdgHvExuoZI480+4eg1zuFU8=,tag:C/SF9jbfLIMhJFXPEEBEFA==,type:bool]
-    sensitive: ENC[AES256_GCM,data:TJmIDP8=,iv:6OjVWwCxQETvi7uJkme/PzBEvyZ4AXlN3E+1IG+Gaqs=,tag:+oBak+FpBozTKthhPEyD2w==,type:bool]
-    remove: []
-    entries:
-      config.json:
-        data: ENC[AES256_GCM,data:WAVeNK7i3bMQzTbszWHntrCEywXRenVt5migaPY0llYgJcpiqlWKo+jf3kHE7nZxKSdSiTjPf5X63jaUa9ip1BsVbxSCzl7XnFoUN4G9Ob8va+2cdXSzqsNAH6BudLs1+SVWAcxuhj5PA+tePEezG3blAZFXXG6Hz7mbJk9OvwLB/sCGViu+Ghe1iLWX/tZi2EFdfJa9My47hoGVS26hxUUxshgyihT96qGsTli/e/hmUvOPlH70ZKZW+/62yXz2WdMPAZMEYcsXw4ah8yPsKwI3or/txuo1wgLh1DC+3TmdiUsyF+4dW9rH5xS1NOgcPB6irfJpEuYayMqLZVHM7pk/GfMGqjosvLR3RSIcIifZR8VGSs3bSeYWnT5GpTu5CT0RzLgr3uTkRa6D7WeqycRRybf+LUuhir0gMOSgg6570oTfGW4Mj3fU3rf5aLZV/OEu67KQmIyZEKtNHHo0OKN1eh2bXQ0VfRDCbgD8ExEP+5DujhdDN9auHUgZnUPQeDdIooAiKE7Q8dl4ynnpX9ggQiZIGMA30DcDR9H9bZFBe3h01TIiBIaJmCGja43uULVnBC4Wx9XK5GcdngKmLSPwqGWEY2QPbhK/PNIQVYkyG3WhH1VhOwivsXqrtTOu6urOEdkTrhzFxhr3yNVyDmkXBxQh9qJBYRU+HERFRXBkE9DDuojGFaBmyD+7QWf+29k7/O91WSyLpBMcOFbgRCsNriLxUDAXSyyzedkI/6KGvqXJ1NN3X9xwlOmNcupZR2CPCGoAQv75+iP8MvhI2A/QSjd/QJa2xP/TzqLNUmql5lfljk2ZrPtpU0kUpWH+iJRt47xOj0vLlxxWz/BHBKsIWBxpONhOzt/pVxjmTL1iE+TExsrJLc/oOpyHfAJA7MXm7yUVBDKlANHWehc3c5m1eLASERyMsjpfS7yZEuy21J4ihMhu1wcD5SPOnC6xF9EslRdsFj3imO5MSpk5mscGkNCkoYnvbW3ZjPPLeUmSFW0q+84a0ihEkGu1OJQ9jvCGmF2zERg80oZZv6f7MftSxop5PMbuLBKd+hhUIIe0cVoi4lRIE364CloTrYdzdp74RqD7xnidgI/gj7oF2YF+YorElda+mBgb3sY+6kxROknpwe1j51Up3gcu2R4M4Qg9YJjhR37O5+sdThWiVAvH/JwhEQ+ewadnpuSfRcKLyfERu5jnMDs8NT7ANB7erY/GtbqDDEDJtr4kHMPkqI55UYrAtzX8GDQeNplrEAOY7dZKziPepSoOFuN5u7beh+6gYFeqfjKqsCc2EauFocdfhjPDitgjjtYbSSUkuOAf4gKSb3zIf7Ij+Rh3G6j5AQcAJMqUdQNMQRoMDE63APl4S0X6jZUrq5P3QU5ZOhPHt2p/waMNZ4nrMhJCjzZ1qbzBajrFSFXmzMGmt5XPdrT9cmLGmSPJIOcBXwg0sRuksjxwbFJWR4UDQi5J0BXK+V7Q6dxFmW4XLTj7113VLaMq7uuh66REFafznVM/iGmUxl8t2d6ENJGFpvxc5tFmO5rdapwT3K2/iExKg8W7IrTX6X48qS/S68WJ7DXb5U/7RQD0jz4EQLCuAy6joi/EX9enh40rtoZUlpPPjLybmXbMzZpazQunuBK6mc95i2JDLM/wPV+Qfxrtt0L20UW0Sd45hsX0mhj2jK9UGmauZK6jiulPABSD0HTiFJKAmhXva1FDiRuAsw9A+GsDabMWU433tklk63nnpNTpNoh8NeGr47GIVgyXlsBcemvfoyoZ6hMevxpcVQbSTYRmGHH4Ja9oMl4QHuyD4zyWUGksc7SdsE8KUlNM7iEuD3/uSClXdue8+asC31/AKu/zmPj2S/C0OYrul17ZboVt7gPX22pIEtcB/9wA2xAzoG488Pn88p+Hs6LJf7YdZe76j0rT7bo4+baemOmt0YbCUtbzmaDUX6oDteV417NLAdzNW0QwpdkK+WlPPQmMSNvKNHgXVg6zGMIVRanThJdJUdfS/L/Q1JmBkMRi8syhHrO/uV9MebGHxXNrvas63ROki52QGqIlaYjlTyRU3Yjcjo6zDxbm/MyYsnWuh0KhfsCxoYoZcfJBCdq7wyJbgGtc21vmWwDpQo+4tYSxlAgLOPUfi0dykaOWF1JvM2oVWrnH1YFZAUkC9zspi8M/sDgIDHBGvuToT8RKjEf7O+U5KzhXPGA2nAGurhL9C8EmAZjy2fzfpKuaxvWv7B0QbGyeC/dnelFyEI+Inv7mVdz+qXbRKNfXfusEPyP1gBwYwkA05qzapHhKqZlGtF2CBYD8DZUJJpfPhQqULl5Yg8ikZTZStzWylh7gDeLkgWh+3SSncNmG+Faj/GR077CR5y5CvgFCw6+cvqS3j/h/nzjYzIeLmKUkctW93jXtxh4x1q5u0lIPKLK9oPivTxjoZQdkpTWmWHswNY/am9jEZ8Es+DvGp9PB3dfI1BeGF6ZolHmWoBLqmDiEMDIiCqbBp0+i6GnOk52sYMpy1HdlW3mfzRTEvnsICfTb9w8X+lu9My6Zmnh6+w9gJD1vzy0QOX3l8dWKVVXqMqoYJxvZ0HraQiBhBNnUnOlk9GCkuV51zTAFfsL2ri5X9WEJt8PijzPKhAmDJQMnAF70bLTBfzea4V8eaI/P6BEL3oxbpw9q2pjSKiQo42i9zYmN7noqM4Jhjq9ggTUsTdT7ar5KoYrNMAJwwYxEAHBMlikQlqRJR46YLDy99DpX6tUn73SBioox89f2t2ux256ZdLd58CZDLxVLH8jzIdXdGUm9uQLgTrRJeT1Ac+l27AYgtDqowJ7vy2sr7EiWIxJ3Qctt4mbjvwOhUgxFCjOs3vps9LKTlZ3NbEs/M4C5eBzMLNTV5hsQPg/IZvEboy8UNXRsYPIRmUgaOR2jm9fvWzCQzeyBLurJ24P2jetuB/wrUxoVSsWyr9SJ33RQWVxPG7wzjP57fMG7a+WQCDTEA/buTtcxXaQpFpKdFlraGyz3Nt6EJI4SNN0uiKwjXfoeN6LBsdjhWEhfovSids1HpWNIoIDjkVEGypEQ7uXHMyLCdBM+FLoXXWnReqa91ofbRlF8XKKh7rmOnu93Mu297RPa070lMeFwDjKq+M2Y2+u/kItxyQENG13CfvLUUs/14Yr4t8byoWHFns81R8I9K5B8X7yFMsUVKj3gLzwRyT70DiVy+kN/Qq1mfjUJV+Ct6Q/cKcGFZiWj/NWDnQyPigxVX3fWl9G6vK2edm/s8DtndzUIFO9qtd5bMD7SPYs5RoRdE6wV72tKJn9QJmHVsPubux6/k/NZzbmPDOr1nWgPaSkx5oT4FBxVwLpzmOvTHWISS5a/HzFjhtmg8jNXvqVeC0/XfhLTk2BA7Xw3muR2OLxZE9+kvqcuYYCyfUVvsSCjmDGK091pZ+dURvUXNWi0MDaY1QkfKcmfXD8d4znN1XAyv1OgdSfutQN4vNQd1CJVAKwf/Wmt7fIhxUONH7TiBGYpwVPipdp4ZMf1jfXTyZ3nhnjyqS8ySugOk3Dc99YRnjVVH+4gR4jMQr1pKV86AW4nGbKBGJ5qM8X8BhEK9rjkkStoHJM8BSo+PBOrG0OxEgto4R3itYCInf5gtK6EMQ1qxza8WjxaDEhTiH120Ud3lH8YBly4RDQmIkJVxgkAuE0NZUfwX+WvNzb463opwJtBef72+GoXW156lu+TNd4TcXomVv9rGK2OpUNMMQXqz8oQaWuy1e4R6hGKDENSAnIhR5TayyV51TFnxVT+JugIj8y4JH7drb49FAZBUYB+DshtqCBNf2sGGEEdlRdEXApj2cCJckLC/gxUT+rgw8AN0DOXnGz0Vlor7ZKs5eE3dMz/ierMKRfVNSeE1Eqfqrz45NoBDkHDegJU40rkWKXC34X1UENXIVunwwlseIdYrzGvhaDqoSHz7sHZJcRSyLqBcDrPpTMQ2pElFOwjb3jmR2lq1H4jyYDHI0fAL5UkezyZLg==,iv:vxGxZsEDNanMqIFjb7aPGnZryfcxPam/GxL+a6GF5vg=,tag:F/+BnrZsnvseYup2I5rOgg==,type:str]
+    config:
+        enabled: ENC[AES256_GCM,data:ZLbr3w==,iv:vIDYb9kw2a2OmzbQQLvuoM5E7cvp4eGp76cD9RoVor0=,tag:hnATI12UV8ulZwYWehXLwQ==,type:bool]
+        sensitive: ENC[AES256_GCM,data:gzgQnIE=,iv:inqAk/K2tGd/qGWOOJmcDo5N31lmUNx/69ErwkqWEmY=,tag:RSQdVmQzTTxe0n8FeMJatA==,type:bool]
+        remove: []
+        entries:
+            config.json:
+                data: ENC[AES256_GCM,data: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,iv:Oa7iZg8TRzazM0bKwF0F9x8NBhk1JYGQypHZKf6EHBs=,tag:kYjsIkmrb0FIsBFJJTJTOg==,type:str]
 sops:
-  kms: []
-  gcp_kms: []
-  azure_kv: []
-  hc_vault: []
-  age:
-    - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
-      enc: |
-        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXbGxtdGhLdlUxWXFjL2oy
-        SEtwa09CMG1JN1M4ancrUHB1VFhzNURGYzNRCkhyWEszT04yeEdSeFFqdWNheVEy
-        U2lFcFJxRDNlZ092cXNqcFJISTlHTGcKLS0tIG9PYXJ6MnJLMkF6VC9pVU1kV09p
-        Z0hlQVE5YWVMTGVqenFlMENsVElWeDAKhr01CynUWRMGp1G1J4CGVnV6A8Sa/TWc
-        o6NZUQ1eJmEzewpQCTa9NBA3KSU2/72oLUb5bVqhnUZuwn1V+awfAw==
-        -----END AGE ENCRYPTED FILE-----
-    - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf
-      enc: |
-        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzSllTdmZrZE1tZ1RZaThy
-        d2xSNUFubGExZnhCckF1d1pSaGFNMTZmZGxnCmFVNURzZ2c5U1ZXMFlQTkdXVER6
-        RkpEeHcwUXA1OWlWV3Q1dWxGOGsvcEkKLS0tIGoxSld2dFdZS3YrTW5rYUJKeUQx
-        T0FxVS9NUnlHRkREMDlWU0FIaU41OW8KbC8FSQCD2kxviuClUY7gdlwQWmSJ8T/3
-        pYh5CZGeAvBbB0jVWJutg9uR3H8KRxUPj3Ietn6342dUa//JV4lqVg==
-        -----END AGE ENCRYPTED FILE-----
-  lastmodified: "2024-10-14T12:38:17Z"
-  mac: ENC[AES256_GCM,data:+jU64zcEw5/WEgRzzJ+gfInkkV+QCtvy7OUbKS2OVE2wMHLxzpGPDOToE/A+kBGyjfFX3aMsbZktn1mE9AB+IjqzaoDGqWyZnP/sPaxqiW6tFLC1vNbgFnGHMa30+yuR2ClKsq8RlKZDxdStcTxtpT230XcKtQeVZGRL2OZoBHM=,iv:7sSepeSiriMkcNChdPjLkiEZaw43nVric4/UKylcJJs=,tag:gRF1QVQbRE5Q58G5qM4GHg==,type:str]
-  pgp: []
-  unencrypted_suffix: _unencrypted
-  version: 3.9.1
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1MThldkw4dVNydUJmbG83
+            enl5MEhrVEZzcUhPZEk3UktrQVZKR0tocVYwCmJPTHVKd0ZJL2dqTkdzeC9CTE1O
+            a3NYZ3piNDc3dG1Sdzc0aTU5M0F0OTgKLS0tIHdhT0FQUlRZQnZ5SkhMVUhDckRU
+            N2wvdFVXSjRJek5QVU81NXBRNzZDTzgKK4C8BGbO7f/kQL7uBKtyBzJ7/UNbvDcP
+            WiHcOtOz7P1OTHLyN8upMhx1w+26HyvUobvoU+hCdfRRki78HcBPhA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPU1pPWkJJbkY4eEtkY3NY
+            d3c2M2xiY0dqem9qNnlQcFh3WjFJc3ZDYUJZCjMvQUFtajdXQUpjVC9uQkhGY3Rv
+            L2NuK2NsNVltRElVMDJ2M2RRNDZHVVkKLS0tIEIxWEowTk0xdG9BdnhzeVVBamRx
+            SU1RTzVUYVFzRkxrRHpKRnZqeGZ0ODQKerBF1625DCX67hoDeyCiiMxZSiV9ghdh
+            4nXYyGfuHptUTj451AuyiGdzkbp2Lg3MN0s21Kfz1TFPstiD9D/b9A==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-10-30T12:16:40Z"
+    mac: ENC[AES256_GCM,data:QXxW/0vx3BssDT8JgK+C8DnVvdQ3Xf1ishNBR2/hSwqBkAwrnmM3hmXsMhnauBr1C4eNhkC5FX8XuX9QZZdpy86F5YY79kcxQktVqJyPOmwlBxlY5pLdrzTKkVl8mShRFg6VAIOdvpdGoLtNXfSoH6EEHatoTGPhrWmVqgMpG+s=,iv:MNOSQH1wZOqfcYvmuTKyIqGPIZQ2atqMZNBWJKHvwjk=,tag:l73NJibMBnR8ZNALvE1Eyg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.1
--- a/values/badhouseplants/secrets.server-xray.yaml
+++ b/values/badhouseplants/secrets.server-xray.yaml
@ -1,28 +1,28 @@
 files:
-  config:
-    enabled: ENC[AES256_GCM,data:YDlGog==,iv:RdrRDL5BhtvZz7s5KedjdXWOm/vt+pVfpiuEZARqBgk=,tag:auxnn7H7GmhP+wrX306twA==,type:bool]
-    sensitive: ENC[AES256_GCM,data:VSCLbxA=,iv:5k8MS47R5aYJquHmhYix26NNdnHuIEbTeUpwKX/oPPk=,tag:0tcFzq2etdtZd/bliv5RmQ==,type:bool]
-    remove: []
-    entries:
-      config.json:
-        data: ENC[AES256_GCM,data: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,iv:ID5lyZ0ZlyJjjq1LX/8aer3+TRoIZvweHe9LDOjTTlI=,tag:H8YUB5HfvBX97ZD3puvHDQ==,type:str]
+    config:
+        enabled: ENC[AES256_GCM,data:/u3nZg==,iv:7b3I/wQEw6HWJNQfD98ROcdesLDDpgGOD9vKF0bGPE8=,tag:E58JVYZvX6N4LEp265wTIQ==,type:bool]
+        sensitive: ENC[AES256_GCM,data:T12sfgI=,iv:aPIfcJ2mOQPjpuFx8yEU3LQ03OJ20Xo+6bnVbinEJAw=,tag:fGoWBpLf2Mi2BubYFm6YsQ==,type:bool]
+        remove: []
+        entries:
+            config.json:
+                data: ENC[AES256_GCM,data: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,iv:CQK+hwz5vr7TtKzB45FMiBp62aoWIA46nSaCtKxqSjM=,tag:U+P+8vrqzV4kV2eBrCtVGw==,type:str]
 sops:
-  kms: []
-  gcp_kms: []
-  azure_kv: []
-  hc_vault: []
-  age:
-    - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
-      enc: |
-        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2VUdscUdCZXhVcVliTHpZ
-        YktWM1NkUzZ1WnBiM2I2WFRNRUdFUUdqV1dnCnVQQUJIZmZTYU8rSWRmSEsvRmIv
-        OEd4TmV5bWVDOXQ3blRpQTlCVEwvRXcKLS0tIGtoY3E5T0M4OFFIbTlTWTErYzMx
-        UkxTVGNvOU1TQ3RqcEQwUjluR2ZSSmMKgIFMiQJZWU0aNnHEzNxFC6MsucT6ana6
-        bfb9xBYpPFEdwXHtKaLnrwZkHlO+y/FyNMQWwOUX8L+GiG0PZg0s3g==
-        -----END AGE ENCRYPTED FILE-----
-  lastmodified: "2024-10-14T08:08:22Z"
-  mac: ENC[AES256_GCM,data:aRxJOiiaiHlI5/lgG8rDfA5DNsfD75KvROUvcFJpqoBmVrDWaRlhTrJfzkuZcWKxLXxi2EEuY0IHl1Mt5Jr6C4g7vGxZWe5cMUWbht1h1WdU+5O5DbrF0kESlj2EzypQUX7VRCAQZeDaKmEQ4W/OUmgnyvuO9qZAxwOhMZHv8dg=,iv:9+/5SxgBmI/DdaLC72liT0ZUHROrONB5TerYuaaYpEw=,tag:ZGmVDD1bb5Rq7Es24b3kaQ==,type:str]
-  pgp: []
-  unencrypted_suffix: _unencrypted
-  version: 3.9.1
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPMFkyNXFSbElXS2lqalox
+            cVRqUUorWlN6ZFlkRE95NmNBY3U2ZU5UQ3pRCkZTYkx3aXFobXRkZ0hkMmxSdnhy
+            K0ZuYzdTcjZhRVl0WEpmVW5sc1lkb2sKLS0tIGdnNlMzSmdqaURDSlJhQ0NFcUlQ
+            YzREc3V1OFYxL1hwYlduRVhaZi9NUGMKHDArn+yrYuWg/iFZntwid7GLcwiGBqo7
+            6jkb7alHWw3J0mw5M5q+oOCnFWYw+Lega2OlNxRF2wv9UDtkGguB1g==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-10-30T12:35:21Z"
+    mac: ENC[AES256_GCM,data:yzKtA1sW6R3TLnXVTPp3v3Agzwil6qxA76dSSP4boyFSgZB5bNe7aJcE7F4kzdXxZuKgAjZBY0zCYZS3br1hyd1dKrjViWJgpnVngWhKiDPG9ecvfX2JbY2id3mb9QZtmZJ/ZB3MzfntN/Vab+ruJGdkN6G7Iv5FLW5boLeRpJc=,iv:rsRSP5dB2Odf9+pjrlthvSKQHIFg6OfvIj/TK6zSyk4=,tag:Bfn2bBG44GH25a/HTdw5Dw==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.1
--- a/values/badhouseplants/values.stalwart.yaml
+++ b/values/badhouseplants/values.stalwart.yaml
@ -1,6 +1,8 @@
 shortcuts:
  hostname: stalwart.badhouseplants.net
 workload:
+  strategy:
+    type: Recreate
  initContainers:
    prepare-config:
      image:
@ -105,40 +107,59 @@ files:
      # Ref: https://github.com/stalwartlabs/mail-server/blob/main/resources/config/config.toml
      config.toml:
        data: |
+          [lookup.default]
+          hostname = "stalwart.badhouseplants.net"
+
          [server.listener."smtp"]
          bind = ["[::]:25"]
          protocol = "smtp"
+          proxy.override = true
+          proxy.trusted-networks.0 = "192.169.0.0/16"

          [server.listener."submission"]
          bind = ["[::]:587"]
          protocol = "smtp"
+          proxy.override = true
+          proxy.trusted-networks.0 = "192.169.0.0/16"

          [server.listener."submissions"]
          bind = ["[::]:465"]
          protocol = "smtp"
          tls.implicit = true
+          proxy.override = true
+          proxy.trusted-networks.0 = "192.169.0.0/16"

          [server.listener."imap"]
          bind = ["[::]:143"]
          protocol = "imap"
+          proxy.override = true
+          proxy.trusted-networks.0 = "192.169.0.0/16"

          [server.listener."imaptls"]
          bind = ["[::]:993"]
          protocol = "imap"
          tls.implicit = true
+          proxy.override = true
+          proxy.trusted-networks.0 = "192.169.0.0/16"

          [server.listener.pop3]
          bind = "[::]:110"
          protocol = "pop3"
+          proxy.override = true
+          proxy.trusted-networks.0 = "192.169.0.0/16"

          [server.listener.pop3s]
          bind = "[::]:995"
          protocol = "pop3"
          tls.implicit = true
+          proxy.override = true
+          proxy.trusted-networks.0 = "192.169.0.0/16"

          [server.listener."sieve"]
          bind = ["[::]:4190"]
          protocol = "managesieve"
+          proxy.override = true
+          proxy.trusted-networks.0 = "192.169.0.0/16"

          [server.listener."https"]
          protocol = "https"
@ -148,6 +169,12 @@ files:
          [server.listener."http"]
          bind = "[::]:8080"
          protocol = "http"
+          hsts = true
+          permissive-cors = false
+          url = "protocol + '://' + key_get('default', 'hostname') + ':' + local_port"
+          use-x-forwarded = true
+          proxy.override = true
+          proxy.trusted-networks.0 = "192.169.0.0/16"

          [storage]
          data = "rocksdb"