Skip to content

Commit

Permalink
Allow override of env settings from host (#10959)
Browse files Browse the repository at this point in the history
* Allow override of env settings from host

This is to avoid stashing/unstashing settings and to push this towards a local .envrc file instead, where the secrets can be encrypted. Keeping unencrypted settings in stash history is a pattern to avoid.

* Add Djstripe webhook secret too
  • Loading branch information
agjohnson authored Dec 18, 2023
1 parent 3fda23d commit 4342385
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion common
5 changes: 5 additions & 0 deletions readthedocs/settings/docker_compose.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ def DATABASES(self): # noqa
AWS_S3_ENDPOINT_URL = "http://storage:9000/"
AWS_QUERYSTRING_AUTH = False

STRIPE_SECRET = os.environ.get("RTD_STRIPE_SECRET")
STRIPE_PUBLISHABLE = os.environ.get("RTD_STRIPE_PUBLISHABLE")
STRIPE_TEST_SECRET_KEY = STRIPE_SECRET
DJSTRIPE_WEBHOOK_SECRET = os.environ.get("RTD_DJSTRIPE_WEBHOOK_SECRET")

RTD_SAVE_BUILD_COMMANDS_TO_STORAGE = True
RTD_BUILD_COMMANDS_STORAGE = "readthedocs.storage.s3_storage.S3BuildCommandsStorage"
BUILD_COLD_STORAGE_URL = "http://storage:9000/builds"
Expand Down

0 comments on commit 4342385

Please sign in to comment.