From 30c2412103e0b81197c28a71500858eb489c70c5 Mon Sep 17 00:00:00 2001 From: vincent porte Date: Wed, 27 Sep 2023 11:16:56 +0200 Subject: [PATCH] =?UTF-8?q?envvar=20:=C2=A0remove=20COMMU=5FENVIRONMENT?= =?UTF-8?q?=C2=A0since=20it=20is=20not=20used=20anymore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/review-app-creation.yml | 1 - config/settings/base.py | 2 -- config/settings/dev.py | 2 -- lacommunaute/utils/settings_context_processors.py | 1 - 4 files changed, 6 deletions(-) diff --git a/.github/workflows/review-app-creation.yml b/.github/workflows/review-app-creation.yml index a7a632459..04b31a3be 100644 --- a/.github/workflows/review-app-creation.yml +++ b/.github/workflows/review-app-creation.yml @@ -68,7 +68,6 @@ jobs: - name: 🤝 Link addons & add environment variables run: | $CLEVER_CLI link $REVIEW_APP_NAME --org $REVIEW_APPS_ORGANIZATION_NAME - $CLEVER_CLI env set COMMU_ENVIRONMENT "REVIEW-APP" $CLEVER_CLI env set COMMU_FQDN "${{ env.DEPLOY_URL }}" $CLEVER_CLI env set S3_STORAGE_BUCKET_NAME c3-django-review-bucket $CLEVER_CLI env set S3_STORAGE_BUCKET_NAME_PUBLIC c3-django-review-bucket-public diff --git a/config/settings/base.py b/config/settings/base.py index 8e13053ee..9dbb695b4 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -242,8 +242,6 @@ }, } -# Environment, sets the type of env of the app (PROD, DEV…) -COMMU_ENVIRONMENT = os.getenv("COMMU_ENVIRONMENT", "PROD") COMMU_PROTOCOL = "https" COMMU_FQDN = os.getenv("COMMU_FQDN", "communaute.inclusion.beta.gouv.fr") diff --git a/config/settings/dev.py b/config/settings/dev.py index c3a8b1987..c14d9ff20 100644 --- a/config/settings/dev.py +++ b/config/settings/dev.py @@ -82,5 +82,3 @@ "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"}, "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}, } - -COMMU_ENVIRONMENT = "DEV" diff --git a/lacommunaute/utils/settings_context_processors.py b/lacommunaute/utils/settings_context_processors.py index 5dfe3a239..38934d221 100644 --- a/lacommunaute/utils/settings_context_processors.py +++ b/lacommunaute/utils/settings_context_processors.py @@ -11,7 +11,6 @@ def expose_settings(request): return { "BASE_TEMPLATE": base_template, "ALLOWED_HOSTS": settings.ALLOWED_HOSTS, - "COMMU_ENVIRONMENT": settings.COMMU_ENVIRONMENT, "MATOMO_URL": settings.MATOMO_URL, "MATOMO_SITE_ID": settings.MATOMO_SITE_ID, "MATOMO_BASE_URL": settings.MATOMO_BASE_URL,