Merge branch 'main' into production

commonknowledge · Aug 28, 2024 · cc3385a · cc3385a
2 parents 2217772 + 7dc66e3
commit cc3385a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app/apps.py b/app/apps.py
@@ -40,7 +40,7 @@ def configure_posthog(self):
 
 
 basic_posthog_event_properties = {
-    "environment": settings.FLY_APP_NAME,
+    "environment": settings.RENDER_APP_NAME,
     "debug": settings.DEBUG,
     "base_url": settings.BASE_URL,
 }
diff --git a/app/settings/base.py b/app/settings/base.py
@@ -360,8 +360,8 @@
 # Github
 GIT_SHA = os.getenv("GIT_SHA", None)
 
-# Fly
-FLY_APP_NAME = os.getenv("FLY_APP_NAME", None)
+# Render
+RENDER_APP_NAME = os.getenv("RENDER_APP_NAME", None)
 
 # Circle
 CIRCLE_API_KEY = os.getenv("CIRCLE_API_KEY", None)
@@ -406,7 +406,7 @@
         # If you wish to associate users to errors (assuming you are using
         # django.contrib.auth) you may enable sending PII data.
         send_default_pii=True,
-        environment=FLY_APP_NAME,
+        environment=RENDER_APP_NAME,
         release=GIT_SHA,
     )
 

diff --git a/app/templates/posthog/globals.html b/app/templates/posthog/globals.html
@@ -2,7 +2,7 @@
 {% include "app/includes/window_setting.html" with setting_name="SENTRY_PROJECT_ID" %}
 {% include "app/includes/window_setting.html" with setting_name="SENTRY_ORG_SLUG" %}
 {% include "app/includes/window_setting.html" with setting_name="SENTRY_DSN" %}
-{% include "app/includes/window_setting.html" with setting_name="FLY_APP_NAME" %}
+{% include "app/includes/window_setting.html" with setting_name="RENDER_APP_NAME" %}
 {% include "app/includes/window_setting.html" with setting_name="GIT_SHA" %}
 {% include "app/includes/window_setting.html" with setting_name="STRIPE_LIVE_MODE" parse="boolean" %}
 </script>
diff --git a/env.d.ts b/env.d.ts
@@ -10,7 +10,7 @@ export declare global {
     SENTRY_PROJECT_ID?: string;
     SENTRY_ORG_SLUG?: string;
     SENTRY_DSN?: string;
-    FLY_APP_NAME?: string;
+    RENDER_APP_NAME?: string;
     GIT_SHA?: string;
     STRIPE_LIVE_MODE: boolean;
     userData?: {

diff --git a/frontend/sentry.ts b/frontend/sentry.ts
@@ -21,7 +21,7 @@ export default function initialiseSentry() {
 
     Sentry.init({
       dsn: window.SENTRY_DSN,
-      environment: window.FLY_APP_NAME,
+      environment: window.RENDER_APP_NAME,
       release: window.GIT_SHA,
 
       // Alternatively, use `process.env.npm_package_version` for a dynamic release version