diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index c66205a86..3e1859de3 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -14,18 +14,10 @@ jobs: uses: ./.github/workflows/linting.yml secrets: inherit - # up to date scan of the staging instance - scan-staging: - name: ZAP scan of the staging site - uses: ./.github/workflows/zap-scan.yml - with: - url: "https://fac-staging.app.cloud.gov/" - deploy-infrastructure-production: name: Deploy infrastructure (production) needs: - testing - - scan-staging uses: ./.github/workflows/terraform-apply-env.yml with: environment: "production" diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index cdc59bf00..e2acb5d11 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -14,17 +14,10 @@ jobs: uses: ./.github/workflows/linting.yml secrets: inherit - scan-dev: - name: Zap Scan - uses: ./.github/workflows/zap-scan.yml - with: - url: "https://fac-dev.app.cloud.gov/" - deploy-infrastructure-staging: name: Deploy infrastructure (staging) needs: - testing - - scan-dev uses: ./.github/workflows/terraform-apply-env.yml with: environment: "staging" diff --git a/backend/config/settings.py b/backend/config/settings.py index 92b807136..1bbced267 100644 --- a/backend/config/settings.py +++ b/backend/config/settings.py @@ -594,6 +594,6 @@ "start": datetime(2024, 12, 5, 17, tzinfo=timezone.utc), "end": datetime(2024, 12, 10, 17, tzinfo=timezone.utc), "template_name": "maintenance_20241210.html", - "message": "FAC.gov will be doing a site upgrade on Tuesday, December 10, 2024 between 12:00 p.m. and 6:00 p.m ET. During this period, the entire website will be unavailable.", + "message": "FAC.gov will be performing maintenance on Tuesday, December 10, 2024 between 12:00 p.m. and 6:00 p.m ET. During this period, the entire website will be unavailable.", }, ] diff --git a/backend/templates/includes/maintenance_banner.html b/backend/templates/includes/maintenance_banner.html index df5941b21..a9e539e98 100644 --- a/backend/templates/includes/maintenance_banner.html +++ b/backend/templates/includes/maintenance_banner.html @@ -1,13 +1,13 @@
-

Scheduled system upgrade

+

Scheduled system maintenance

{% comment %} If a message is given, use it. If not, display a generic message with the timeframe. {% endcomment %}

{% if MAINTENANCE_BANNER_MESSAGE %} {{ MAINTENANCE_BANNER_MESSAGE }} {% else %} - FAC.gov will be doing a site upgrade from {{ MAINTENANCE_BANNER_START_TIME|date:"N j, Y, f A" }} to {{ MAINTENANCE_BANNER_END_TIME|date:"N j, Y, f A" }}. + FAC.gov will be performing maintenance from {{ MAINTENANCE_BANNER_START_TIME|date:"N j, Y, f A" }} to {{ MAINTENANCE_BANNER_END_TIME|date:"N j, Y, f A" }}. During this period, the entire website will be unavailable. {% endif %}