archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Streamlined some GCloud credential configuration

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-03-15 10:18:25 +01:00
parent 5c6bda1ba3
commit e73e8ccc31
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/application/__init__.py
View File

@@ -110,7 +110,7 @@ try:
os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = \ os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = \
app.config['GCLOUD_APP_CREDENTIALS'] app.config['GCLOUD_APP_CREDENTIALS']
except KeyError: except KeyError:
raise SystemExit('GOOGLE_APPLICATION_CREDENTIALS configuration is missing') raise SystemExit('GCLOUD_APP_CREDENTIALS configuration is missing')
# Storage backend (GCS) # Storage backend (GCS)
try: try:

3
pillar/config.py.example
View File

@@ -25,8 +25,9 @@ class Development(object):
# Credentials to access project on the Google Cloud where Google Cloud # Credentials to access project on the Google Cloud where Google Cloud
# Storage is enabled (Pillar will automatically create and manage buckets) # Storage is enabled (Pillar will automatically create and manage buckets)
GOOGLE_APPLICATION_CREDENTIALS = os.environ.get( GCLOUD_APP_CREDENTIALS = os.environ.get(
'GOOGLE_APPLICATION_CREDENTIALS', '/data/config/google_app.json') 'GOOGLE_APPLICATION_CREDENTIALS', '/data/config/google_app.json')
GCLOUD_PROJECT = ''
# Fill in only if we plan to sign our urls using a the CDN # Fill in only if we plan to sign our urls using a the CDN
CDN_USE_URL_SIGNING = False CDN_USE_URL_SIGNING = False