Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nix knight/ali/docker settings #32

Open
wants to merge 6 commits into
base: NIXKnight/docker-settings
Choose a base branch
from
Open

Nix knight/ali/docker settings #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd2dd18
added customer name identifier in the queue names
Dec 10, 2019
22bdb01
Allow Celery Default Exchange to Override from token json file
Dec 10, 2019
587a160
Get Customer Name from the Env token file
Dec 10, 2019
108dd6b
Get Customer Name from the Env token file
Dec 10, 2019
7cab478
Make sure ENV_TOKENS is available before trying to get CUSTOMER NAME
Dec 11, 2019
3cb1adf
Merge branch 'NIXKnight/docker-settings' into NIXKnight/ali/docker-se…
m-ali-0001 Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions cms/envs/edly-trial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@

QUEUE_VARIANT = CONFIG_PREFIX.lower()


############# NON-SECURE ENV CONFIG ##############################
# Things like server locations, ports, etc.
with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file:
ENV_TOKENS = json.load(env_file)


# Append Customer Name identifier in all celery queues names and celery default exchange
ENV_CUSTOMER_NAME = ENV_TOKENS.get('CUSTOMER_NAME_IDENTIFIER', None)
CUSTOMER_NAME = ENV_CUSTOMER_NAME + "." if ENV_CUSTOMER_NAME else "".lower()
Expand All @@ -91,10 +98,7 @@

CELERY_ROUTES = "{}celery.Router".format(QUEUE_VARIANT)

############# NON-SECURE ENV CONFIG ##############################
# Things like server locations, ports, etc.
with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file:
ENV_TOKENS = json.load(env_file)


# Do NOT calculate this dynamically at startup with git because it's *slow*.
EDX_PLATFORM_REVISION = ENV_TOKENS.get('EDX_PLATFORM_REVISION', EDX_PLATFORM_REVISION)
Expand Down
13 changes: 7 additions & 6 deletions lms/envs/edly-trial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@

QUEUE_VARIANT = CONFIG_PREFIX.lower()

########################## NON-SECURE ENV CONFIG ##############################
# Things like server locations, ports, etc.

with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file:
ENV_TOKENS = json.load(env_file)


# Append Customer Name identifier in all celery queues names and celery default exchange
ENV_CUSTOMER_NAME = ENV_TOKENS.get('CUSTOMER_NAME_IDENTIFIER', None)
CUSTOMER_NAME = ENV_CUSTOMER_NAME + "." if ENV_CUSTOMER_NAME else "".lower()
Expand All @@ -108,12 +115,6 @@
CELERY_ROUTES = "{}celery.Router".format(QUEUE_VARIANT)
CELERYBEAT_SCHEDULE = {} # For scheduling tasks, entries can be added to this dict

########################## NON-SECURE ENV CONFIG ##############################
# Things like server locations, ports, etc.

with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file:
ENV_TOKENS = json.load(env_file)

# Authorizenet payment processor set a cookie for dashboard to show pending course purchased dashoard
# notification. This cookie domain will be used to set and delete that cookie.
ECOMMERCE_COOKIE_DOMAIN = ENV_TOKENS.get('ECOMMERCE_COOKIE_DOMAIN', None)
Expand Down