From d658f8fb74419b94f1b7982fcc167cd6db346d93 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Thu, 30 Mar 2017 19:29:04 +1100 Subject: [PATCH] Store user files in GCS - Ephemeral Disks Issue #2 --- pinaxcon/settings.py | 13 +++++-------- requirements.txt | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index d63ded24..c4d52db9 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -328,11 +328,8 @@ SAML_CONFIG = { 'valid_for': 1, } -# Production settings have their own file to override stuff here -try: - LOCAL_SETTINGS -except NameError: - try: - from local_settings import * # noqa: F401,F403 - except ImportError: - pass +DEFAULT_FILE_STORAGE = 'gapc_storage.storage.GoogleCloudStorage' +GAPC_STORAGE = { + 'bucket': 'bucket', + 'num_retries': 2, +} diff --git a/requirements.txt b/requirements.txt index 2ad1b866..240bf7eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ raven==5.27.0 django-debug-toolbar==1.6 djangosaml2 +-e git+https://github.com/nakato/django-gapc-storage.git@master#egg=django-gapc-storage # database mysqlclient>=1.3.3