uploads: Set a BOTO_CONFIG path to override broken GCE configuration.

The comment is pretty self-explanatory.  The fact that Google Compute
Engine has this problem does not impress confidence about their
product, but hopefully this is the only really dumb thing they do.

Fixes #4839.
This commit is contained in:
Tim Abbott 2017-10-08 19:42:12 -07:00
parent 0691724836
commit 88bb6c6cad
1 changed files with 9 additions and 0 deletions

View File

@ -87,6 +87,15 @@ TUTORIAL_ENABLED = True
# This is overridden in test_settings.py for the test suites # This is overridden in test_settings.py for the test suites
CASPER_TESTS = False CASPER_TESTS = False
# Google Compute Engine has an /etc/boto.cfg that is "nicely
# configured" to work with GCE's storage service. However, their
# configuration is super aggressive broken, in that it means importing
# boto in a virtualenv that doesn't contain the GCE tools crashes.
#
# By using our own path for BOTO_CONFIG, we can cause boto to not
# process /etc/boto.cfg.
os.environ['BOTO_CONFIG'] = '/etc/zulip/boto.cfg'
# Import variables like secrets from the prod_settings file # Import variables like secrets from the prod_settings file
# Import prod_settings after determining the deployment/machine type # Import prod_settings after determining the deployment/machine type
if PRODUCTION: if PRODUCTION: