Skip to content
This repository was archived by the owner on Aug 26, 2022. It is now read-only.

Commit eccbadb

Browse files
authored
remove settings that are no longer used (#8012)
1 parent b579a05 commit eccbadb

2 files changed

Lines changed: 0 additions & 35 deletions

File tree

kuma/settings/common.py

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -374,17 +374,6 @@ def _get_locales():
374374
_PROD_ATTACHMENT_ORIGIN = "demos-origin.mdn.mozit.cloud"
375375
ATTACHMENT_ORIGIN = config("ATTACHMENT_ORIGIN", default=_PROD_ATTACHMENT_ORIGIN)
376376

377-
# Primary use case if for file attachments that are still served via Kuma.
378-
# We have settings.ATTACHMENTS_USE_S3 on by default. So a URL like
379-
# `/files/3710/Test_Form_2.jpg` will trigger a 302 response (to its final
380-
# public S3 URL). This 302 response can be cached in the CDN. That's what
381-
# this setting controls.
382-
# We can make it pretty aggressive, because as of early 2021, you can't
383-
# edit images by uploading a different one through the Wiki UI.
384-
ATTACHMENTS_CACHE_CONTROL_MAX_AGE = config(
385-
"ATTACHMENTS_CACHE_CONTROL_MAX_AGE", default=60 * 60 * 24, cast=int
386-
)
387-
388377
# This should never be false for the production and stage deployments.
389378
ENABLE_RESTRICTIONS_BY_HOST = config(
390379
"ENABLE_RESTRICTIONS_BY_HOST", default=True, cast=bool
@@ -540,19 +529,6 @@ def _get_locales():
540529
"CACHE_CONTROL_DEFAULT_SHARED_MAX_AGE", default=60 * 5, cast=int
541530
)
542531

543-
544-
# Setting for configuring the AWS S3 bucket name used for the document API.
545-
MDN_API_S3_BUCKET_NAME = config("MDN_API_S3_BUCKET_NAME", default=None)
546-
547-
# AWS S3 credentials and settings for uploading attachments
548-
ATTACHMENTS_AWS_ACCESS_KEY_ID = config("ATTACHMENTS_AWS_ACCESS_KEY_ID", default=None)
549-
ATTACHMENTS_AWS_SECRET_ACCESS_KEY = config(
550-
"ATTACHMENTS_AWS_SECRET_ACCESS_KEY", default=None
551-
)
552-
ATTACHMENTS_AWS_STORAGE_BUCKET_NAME = config(
553-
"ATTACHMENTS_AWS_STORAGE_BUCKET_NAME", default="media"
554-
)
555-
556532
ATTACHMENTS_AWS_S3_CUSTOM_DOMAIN = config(
557533
"ATTACHMENTS_AWS_S3_CUSTOM_DOMAIN", default="media.prod.mdn.mozit.cloud"
558534
) # For example, Cloudfront CDN domain
@@ -561,9 +537,6 @@ def _get_locales():
561537
) # Does the custom domain use TLS
562538
ATTACHMENTS_AWS_S3_CUSTOM_URL = f"{'https' if ATTACHMENTS_AWS_S3_SECURE_URLS else 'http'}://{ATTACHMENTS_AWS_S3_CUSTOM_DOMAIN}"
563539

564-
ATTACHMENTS_AWS_S3_REGION_NAME = config(
565-
"ATTACHMENTS_AWS_S3_REGION_NAME", default="us-east-1"
566-
)
567540
ATTACHMENTS_AWS_S3_ENDPOINT_URL = config(
568541
"ATTACHMENTS_AWS_S3_ENDPOINT_URL", default=None
569542
)

kuma/settings/pytest.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
AWS_BUCKET_ACL = None
4747
AWS_DEFAULT_ACL = None
4848

49-
# Use a dedicated minio bucket for tests
50-
ATTACHMENTS_AWS_STORAGE_BUCKET_NAME = "test"
51-
5249
# To make absolutely sure we never accidentally trigger the GA tracking
5350
# within tests to the actual (and default) www.google-analytics.com this is
5451
# an extra safeguard.
@@ -57,11 +54,6 @@
5754
# Because that's what all the tests presume.
5855
SITE_ID = 1
5956

60-
# Stripe API KEY settings
61-
STRIPE_PUBLIC_KEY = "testing"
62-
STRIPE_SECRET_KEY = "testing"
63-
STRIPE_PRICE_IDS = ["price_0000001", "price_0000002"]
64-
6557
# For legacy reasons, the tests assume these are always true so don't
6658
# let local overrides take effect.
6759
INDEX_HTML_ATTRIBUTES = True

0 commit comments

Comments
 (0)