Skip to content

E
edx-platform
Commit a8ffbe34 by Bertrand Marron
Options

Revert "Allow custom S3 host" 

This reverts commit a4965f80.
parent 76e7f808
Showing with 1 additions and 3 deletions
cms/envs/aws.py
......@@ -243,7 +243,6 @@ SEGMENT_IO_KEY = AUTH_TOKENS.get('SEGMENT_IO_KEY')
if SEGMENT_IO_KEY:
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"]
if AWS_ACCESS_KEY_ID == "":
AWS_ACCESS_KEY_ID = None
......
lms/envs/aws.py
......@@ -367,7 +367,6 @@ CC_PROCESSOR = AUTH_TOKENS.get('CC_PROCESSOR', CC_PROCESSOR)
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"]
if AWS_ACCESS_KEY_ID == "":
AWS_ACCESS_KEY_ID = None
......
requirements/edx/base.txt
......@@ -30,6 +30,7 @@ django-openid-auth==0.4
django-robots==0.9.1
django-sekizai==0.6.1
django-ses==0.4.1
django-storages==1.1.5
django-threaded-multihost==1.4-1
django-method-override==0.1.0
djangorestframework==2.3.14
......
requirements/edx/github.txt
......@@ -47,5 +47,4 @@ git+https://github.com/edx/edx-lint.git@8bf82a32ecb8598c415413df66f5232ab8d974e9
-e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga
# IONISx:
-e git+https://github.com/IONISx/django-storages.git@aws-custom-host#egg=django-storages
-e git+https://github.com/IONISx/edx-grades-api@67a13915722fb7e3b748542aa9a081d840e0be23#egg=edx-grades-api
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