Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix dogfooding (#3377)
Uku Tahtaee6f105c231
diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 7f077c24d9..ac994ab0c0 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -230,7 +230,6 @@ defmodule PlausibleWeb.SiteController dosite = conn.assigns[:site] |> Repo.preload(:custom_domain)conn- |> assign(:skip_plausible_tracking, true)|> render("settings_funnels.html",site: site,dogfood_page_path: "/:dashboard/settings/funnels",@@ -243,7 +242,6 @@ defmodule PlausibleWeb.SiteController dosite = conn.assigns[:site] |> Repo.preload(:custom_domain)conn- |> assign(:skip_plausible_tracking, true)|> render("settings_props.html",site: site,dogfood_page_path: "/:dashboard/settings/properties",diff --git a/lib/plausible_web/templates/layout/_tracking.html.heex b/lib/plausible_web/templates/layout/_tracking.html.heexindex 5181af6cf3..9e3cc9b1c2 100644--- a/lib/plausible_web/templates/layout/_tracking.html.heex+++ b/lib/plausible_web/templates/layout/_tracking.html.heex@@ -1,5 +1,10 @@<%= if !Application.get_env(:plausible, :is_selfhost) && [email protected][:skip_plausible_tracking] do %>- <script defer data-domain={dogfood_domain(@conn)} src={dogfood_script_url()}>+ <script+ defer+ data-api={dogfood_api_destination()}+ data-domain={dogfood_domain(@conn)}+ src={dogfood_script_url()}+ ></script><script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.exindex e4b6c6fcfc..d0ce1b2558 100644--- a/lib/plausible_web/views/layout_view.ex+++ b/lib/plausible_web/views/layout_view.ex@@ -29,6 +29,16 @@ defmodule PlausibleWeb.LayoutView doendend+ @doc """+ Temporary override to do more testing of the new ingest.plausible.io endpoint for accepting events. In staging and locally+ will fall back to staging.plausible.io/api/event and localhost:8000/api/event respectively.+ """+ def dogfood_api_destination() do+ if Application.get_env(:plausible, :environment) == "prod" do+ "https://ingest.plausible.io/api/event"+ end+ end+def home_dest(conn) doif conn.assigns[:current_user] do"/sites"