Граф коммитов

8 Коммитов

Автор SHA1 Сообщение Дата
Steve Jalim 8a029627d8
Revert "Set BOUNCER_URL for demos to be the dev bouncer, for all demos (#13981)" (#13982)
This reverts commit 08cc575e7b.
2023-12-05 19:31:53 +00:00
Steve Jalim 08cc575e7b
Set BOUNCER_URL for demos to be the dev bouncer, for all demos (#13981) 2023-12-05 18:58:15 +00:00
maureenlholland cc6b4e2234 Update Pocket GTM Container (fixes #12624)
We have moved Pocket's GA4 property under the Mozilla Account.
We use a lookup table in the GTM container to set measurement ID
based on whether the hostname is production or not.
If production, the measurement ID connects to getpocket.com - GA4
property.
If not production, the measurement ID connects to getpocket.com -
GA4 Testing property.
2023-03-10 09:57:48 +00:00
Steve Jalim 4b229f5373
Remove STUB_ATTRIBUTION_HMAC_KEY from mozorg demo env vars... (#12615)
...now it's in Secrets instead. With it present in both, Cloud Run fails
to boot the container

Co-authored-by: www-site-checker bot <None>
2023-01-19 22:29:59 +00:00
Nathan Barrett 4cb0ef523b
Add GA4 to pocket pages (#12433)
* Add GA4 to pocket pages

* update csp

* Add GTM ID to settings

* PR Revisions
2023-01-04 14:04:01 -06:00
Alex Gibson 2a8cd01524
Move email preference center to the front-end (Fixes #11946) (#12359) 2023-01-04 09:21:12 +00:00
Steve Jalim a051d005d9
Make Pocket-Mode Google Analytics ID configurable (#12269)
* Allow Pocket Mode to draw its Google Analytics code from settings, if available

...else do not boot up Google Analytics at all

* Add GA config for Pocket-mode demos

* Re-group Google Analytics-related settings
2022-10-31 14:37:27 +00:00
Steve Jalim e6e1264ec6
Mozorg and Pocket Demos on Cloud Run (#11685)
* Lay in initial Cloud Build configs for generating demo apps on Cloud Run

This is experimental for now.

There are two configs in this changeset, one for mozorg and a very similar
one for pocket. They both trigger builds of containers, uploads them to
Artifact Registry in us-central1 and deoploys them to Cloud Run in either
Mozorg mode or Pocket mode, respectively.

This is not the entire puzzle, though. We also will need to...

1) Set up corresponding Services with the expected names, which are taken
from the branch names: mozorg-demo-1, mozorg-demo-2....5, pocket-demo-1,
pocket-demo-2 (We'll just have two pocket demos for now)

2) Set up custom domains to those (now-known) services

3) Setting appropriate hostnames for ALLOWED_HOSTS, rather than the wildcard

As for setting custom env vars - that's still to be solved.

* Update ENV var handling, ahead of setting some in the Service

* Update demo config to use separate env file(s)

We can't support multiple env files, so developers can't have a core env
and then add to a 'demo.env' additional file, unfortunately.

However, they can edit/add to these new Mozorg- or Pocket-specific env files.
There may be an occaisonal merge conflict in these files, but that should
be very rare.

Secrets are kept secret and need to be provisioned separately. At the moment
we're going with a somewhat verbose and numerous set of secrets, but maybe
we can pull all this into a single YAML file of secrets, like we do with k8s.

* Rename Cloud Build config files and add cloud-only logging option

* Drop cloudbuld YAML config for GCP demos - moved to infra repo instead

* Remove redundant config from Pocket demo env vars
2022-06-28 09:58:13 +01:00