From b140d631f57363ae2e216b20e3dfe36d599f09a7 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Thu, 18 Jan 2024 11:42:17 -0500 Subject: [PATCH] update all references to beta.get.gov to get.gov in all settings files; update application_org_contact to use _public_site_url rather than hardcoded value --- ops/manifests/manifest-ab.yaml | 2 +- ops/manifests/manifest-backup.yaml | 2 +- ops/manifests/manifest-bl.yaml | 2 +- ops/manifests/manifest-development.yaml | 2 +- ops/manifests/manifest-dk.yaml | 2 +- ops/manifests/manifest-es.yaml | 2 +- ops/manifests/manifest-gd.yaml | 2 +- ops/manifests/manifest-ko.yaml | 2 +- ops/manifests/manifest-ky.yaml | 2 +- ops/manifests/manifest-nl.yaml | 2 +- ops/manifests/manifest-rb.yaml | 2 +- ops/manifests/manifest-rh.yaml | 2 +- ops/manifests/manifest-rjm.yaml | 2 +- ops/manifests/manifest-stable.yaml | 2 +- ops/manifests/manifest-staging.yaml | 2 +- ops/manifests/manifest-za.yaml | 2 +- ops/scripts/manifest-sandbox-template-migrate.yaml | 2 +- ops/scripts/manifest-sandbox-template.yaml | 2 +- src/docker-compose.yml | 2 +- src/registrar/config/settings.py | 2 +- src/registrar/templates/application_org_contact.html | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ops/manifests/manifest-ab.yaml b/ops/manifests/manifest-ab.yaml index 38109bdcb..3ca800392 100644 --- a/ops/manifests/manifest-ab.yaml +++ b/ops/manifests/manifest-ab.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-backup.yaml b/ops/manifests/manifest-backup.yaml index c4615d1d5..ab9e36d68 100644 --- a/ops/manifests/manifest-backup.yaml +++ b/ops/manifests/manifest-backup.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-bl.yaml b/ops/manifests/manifest-bl.yaml index 59529278b..ea0617427 100644 --- a/ops/manifests/manifest-bl.yaml +++ b/ops/manifests/manifest-bl.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-development.yaml b/ops/manifests/manifest-development.yaml index 0a1f30ffa..08244cf08 100644 --- a/ops/manifests/manifest-development.yaml +++ b/ops/manifests/manifest-development.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-dk.yaml b/ops/manifests/manifest-dk.yaml index 256beeda2..071efb416 100644 --- a/ops/manifests/manifest-dk.yaml +++ b/ops/manifests/manifest-dk.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-es.yaml b/ops/manifests/manifest-es.yaml index 47c78ce1b..7fd19b7a0 100644 --- a/ops/manifests/manifest-es.yaml +++ b/ops/manifests/manifest-es.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-gd.yaml b/ops/manifests/manifest-gd.yaml index 0c4b2535f..89a7c2169 100644 --- a/ops/manifests/manifest-gd.yaml +++ b/ops/manifests/manifest-gd.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-ko.yaml b/ops/manifests/manifest-ko.yaml index cc6a09337..a69493f9b 100644 --- a/ops/manifests/manifest-ko.yaml +++ b/ops/manifests/manifest-ko.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-ky.yaml b/ops/manifests/manifest-ky.yaml index 31d67cfb3..f416d7385 100644 --- a/ops/manifests/manifest-ky.yaml +++ b/ops/manifests/manifest-ky.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-nl.yaml b/ops/manifests/manifest-nl.yaml index ca6fb4693..d74174e7d 100644 --- a/ops/manifests/manifest-nl.yaml +++ b/ops/manifests/manifest-nl.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-rb.yaml b/ops/manifests/manifest-rb.yaml index 62f243513..570b49dde 100644 --- a/ops/manifests/manifest-rb.yaml +++ b/ops/manifests/manifest-rb.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-rh.yaml b/ops/manifests/manifest-rh.yaml index 4985f3261..f44894ce8 100644 --- a/ops/manifests/manifest-rh.yaml +++ b/ops/manifests/manifest-rh.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-rjm.yaml b/ops/manifests/manifest-rjm.yaml index 7d72e7835..048b44e95 100644 --- a/ops/manifests/manifest-rjm.yaml +++ b/ops/manifests/manifest-rjm.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-stable.yaml b/ops/manifests/manifest-stable.yaml index d8502c625..a70035445 100644 --- a/ops/manifests/manifest-stable.yaml +++ b/ops/manifests/manifest-stable.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Which OIDC provider to use OIDC_ACTIVE_PROVIDER: login.gov production # Flag to disable/enable features in prod environments diff --git a/ops/manifests/manifest-staging.yaml b/ops/manifests/manifest-staging.yaml index b616973ac..38099cf17 100644 --- a/ops/manifests/manifest-staging.yaml +++ b/ops/manifests/manifest-staging.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/manifests/manifest-za.yaml b/ops/manifests/manifest-za.yaml index 1b84a74a1..271f49da9 100644 --- a/ops/manifests/manifest-za.yaml +++ b/ops/manifests/manifest-za.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/ops/scripts/manifest-sandbox-template-migrate.yaml b/ops/scripts/manifest-sandbox-template-migrate.yaml index dfebed766..9054e9494 100644 --- a/ops/scripts/manifest-sandbox-template-migrate.yaml +++ b/ops/scripts/manifest-sandbox-template-migrate.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # use a non-default route to avoid conflicts routes: - route: getgov-ENVIRONMENT-migrate.app.cloud.gov diff --git a/ops/scripts/manifest-sandbox-template.yaml b/ops/scripts/manifest-sandbox-template.yaml index 8cdb8d71b..f0aee9664 100644 --- a/ops/scripts/manifest-sandbox-template.yaml +++ b/ops/scripts/manifest-sandbox-template.yaml @@ -22,7 +22,7 @@ applications: # Tell Django how much stuff to log DJANGO_LOG_LEVEL: INFO # default public site location - GETGOV_PUBLIC_SITE_URL: https://beta.get.gov + GETGOV_PUBLIC_SITE_URL: https://get.gov # Flag to disable/enable features in prod environments IS_PRODUCTION: False routes: diff --git a/src/docker-compose.yml b/src/docker-compose.yml index c9b78fd8e..ba6530674 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -32,7 +32,7 @@ services: # Is this a production environment - IS_PRODUCTION # Public site URL link - - GETGOV_PUBLIC_SITE_URL=https://beta.get.gov + - GETGOV_PUBLIC_SITE_URL=https://get.gov # Set a username for accessing the registry - REGISTRY_CL_ID=nothing # Set a password for accessing the registry diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py index 2de7e6eb2..efa512f22 100644 --- a/src/registrar/config/settings.py +++ b/src/registrar/config/settings.py @@ -335,7 +335,7 @@ CSP_INCLUDE_NONCE_IN = ["script-src-elem"] # Cross-Origin Resource Sharing (CORS) configuration # Sets clients that allow access control to manage.get.gov # TODO: remove :8080 to see if we can have all localhost access -CORS_ALLOWED_ORIGINS = ["http://localhost:8080", "https://beta.get.gov"] +CORS_ALLOWED_ORIGINS = ["http://localhost:8080", "https://beta.get.gov", "https://get.gov"] CORS_ALLOWED_ORIGIN_REGEXES = [r"https://[\w-]+\.sites\.pages\.cloud\.gov"] # Content-Length header is set by django.middleware.common.CommonMiddleware diff --git a/src/registrar/templates/application_org_contact.html b/src/registrar/templates/application_org_contact.html index 01b55d03d..8ddd2e6fd 100644 --- a/src/registrar/templates/application_org_contact.html +++ b/src/registrar/templates/application_org_contact.html @@ -2,7 +2,7 @@ {% load field_helpers %} {% block form_instructions %} -

If your domain request is approved, the name of your organization and your city/state will be listed in .gov’s public data.

+

If your domain request is approved, the name of your organization and your city/state will be listed in .gov’s public data.

What is the name and mailing address of the organization you represent?