Merge pull request #58 from sparkfabrik/feature/google-gfe-ips

fix: always trust google front end ips
sparkfabrik · Jul 22, 2024 · 666a139 · 666a139
2 parents 040f9a4 + 405b561
commit 666a139
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -19,7 +19,8 @@ mastodon:
     vapid:
       private_key: ${MASTODON_VAPID_PRIVATE_KEY}
       public_key: ${MASTODON_VAPID_PUBLIC_KEY}
-  trusted_proxy_ip: ${MASTODON_TRUSTED_PROXY_IP}
+  # Always trust GCP GFE ips: https://cloud.google.com/load-balancing/docs/https
+  trusted_proxy_ip: ${MASTODON_TRUSTED_PROXY_IP},130.211.0.0/22,35.191.0.0/16
   streaming:
     replicas: 2
   web: