Skip to content

E
edx-platform
Commit 8a96e7ad by Bertrand Marron Committed by Bertrand Marron
Options

Allow custom S3 host

parent 523d95ec
Showing with 5 additions and 1 deletions
cms/envs/aws.py
...@@ -233,6 +233,7 @@ SEGMENT_IO_KEY = AUTH_TOKENS.get('SEGMENT_IO_KEY') ...@@ -233,6 +233,7 @@ SEGMENT_IO_KEY = AUTH_TOKENS.get('SEGMENT_IO_KEY')
if SEGMENT_IO_KEY: if SEGMENT_IO_KEY:
FEATURES['SEGMENT_IO'] = ENV_TOKENS.get('SEGMENT_IO', False) FEATURES['SEGMENT_IO'] = ENV_TOKENS.get('SEGMENT_IO', False)
AWS_S3_HOST = AUTH_TOKENS.get("AWS_S3_HOST")
AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"] AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]
if AWS_ACCESS_KEY_ID == "": if AWS_ACCESS_KEY_ID == "":
AWS_ACCESS_KEY_ID = None AWS_ACCESS_KEY_ID = None
......
lms/envs/aws.py
...@@ -318,6 +318,7 @@ CC_PROCESSOR = AUTH_TOKENS.get('CC_PROCESSOR', CC_PROCESSOR) ...@@ -318,6 +318,7 @@ CC_PROCESSOR = AUTH_TOKENS.get('CC_PROCESSOR', CC_PROCESSOR)
SECRET_KEY = AUTH_TOKENS['SECRET_KEY'] SECRET_KEY = AUTH_TOKENS['SECRET_KEY']
AWS_S3_HOST = AUTH_TOKENS.get("AWS_S3_HOST")
AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"] AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]
if AWS_ACCESS_KEY_ID == "": if AWS_ACCESS_KEY_ID == "":
AWS_ACCESS_KEY_ID = None AWS_ACCESS_KEY_ID = None
......
requirements/edx/base.txt
...@@ -30,7 +30,6 @@ django-openid-auth==0.4 ...@@ -30,7 +30,6 @@ django-openid-auth==0.4
django-robots==0.9.1 django-robots==0.9.1
django-sekizai==0.6.1 django-sekizai==0.6.1
django-ses==0.4.1 django-ses==0.4.1
django-storages==1.1.5
django-threaded-multihost==1.4-1 django-threaded-multihost==1.4-1
django-method-override==0.1.0 django-method-override==0.1.0
djangorestframework==2.3.14 djangorestframework==2.3.14
......
requirements/edx/github.txt
...@@ -36,3 +36,6 @@ git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a ...@@ -36,3 +36,6 @@ git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a
-e git+https://github.com/edx/i18n-tools.git@56f048af9b6868613c14aeae760548834c495011#egg=i18n-tools -e git+https://github.com/edx/i18n-tools.git@56f048af9b6868613c14aeae760548834c495011#egg=i18n-tools
-e git+https://github.com/edx/edx-oauth2-provider.git@0.4.0#egg=oauth2-provider -e git+https://github.com/edx/edx-oauth2-provider.git@0.4.0#egg=oauth2-provider
-e git+https://github.com/edx/edx-val.git@ba00a5f2e0571e9a3f37d293a98efe4cbca850d5#egg=edx-val -e git+https://github.com/edx/edx-val.git@ba00a5f2e0571e9a3f37d293a98efe4cbca850d5#egg=edx-val
# IONISx:
-e git+https://github.com/IONISx/django-storages.git@aws-custom-host#egg=django-storages
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment