From 276a87c0b3ab972262079623f85ff0373837f7a8 Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Sun, 21 Jan 2018 21:06:51 +0000
Subject: [PATCH] Now on the bucket list :)

---
 buckets/mhackspace/README.org |  1 +
 config/settings/local.py      | 25 ++++++++++++++++++++++++-
 config/settings/stage.py      | 22 ++++++++++++++++++++++
 dev.yml                       |  6 ++++++
 requirements/base.txt         | 14 +++++++++++---
 requirements/production.txt   |  4 ----
 6 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 buckets/mhackspace/README.org

diff --git a/buckets/mhackspace/README.org b/buckets/mhackspace/README.org
new file mode 100644
index 0000000..8097384
--- /dev/null
+++ b/buckets/mhackspace/README.org
@@ -0,0 +1 @@
+Place holder directory, each folder inside buckets folder is a fake digitalocean space or fake amazon bucket.
diff --git a/config/settings/local.py b/config/settings/local.py
index 4f6e59a..ea7a1f5 100644
--- a/config/settings/local.py
+++ b/config/settings/local.py
@@ -59,7 +59,7 @@ CACHES = {
 
 
 # django-debug-toolbar
-# ------------------------------------------------------------------------------
+# ---------------------MDVTDNXFTRJSJBX9KWOJTMCGSNMYASEFNBPDUZJMGSPPCVMQRUZMZAEXDTIGHPZCP9JBGLVKGSJMZKPVV---------------------------------------------------------
 MIDDLEWARE += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 INSTALLED_APPS += ('debug_toolbar', )
 
@@ -80,6 +80,7 @@ DEBUG_TOOLBAR_CONFIG = {
 # django-extensions
 # ------------------------------------------------------------------------------
 INSTALLED_APPS += ('django_extensions', )
+INSTALLED_APPS += ('storages', )
 
 # TESTING
 # ------------------------------------------------------------------------------
@@ -147,3 +148,25 @@ LOGGING = {
 
 PAYMENT_PROVIDERS['gocardless']['redirect_url'] = 'http://127.0.0.1:8180'
 TEMPLATE_DEBUG = False
+
+
+AWS_S3_SECURE_URLS = False
+AWS_ACCESS_KEY_ID = env('MINIO_ACCESS_KEY')
+AWS_SECRET_ACCESS_KEY = env('MINIO_SECRET_KEY')
+AWS_S3_ENDPOINT_URL = 'http://bucket:9000'
+
+
+# AWS_S3_SECURE_URLS = True
+# AWS_ACCESS_KEY_ID = env('DIGITALOCEAN_SPACE_KEY')
+# AWS_SECRET_ACCESS_KEY = env('DIGITALOCEAN_SPACE_SECRET')
+# AWS_S3_ENDPOINT_URL = 'https://ams3.digitaloceanspaces.com'
+AWS_STORAGE_BUCKET_NAME = 'mhackspace'
+AWS_S3_OBJECT_PARAMETERS = {
+    'CacheControl': 'max-age=86400',
+}
+AWS_LOCATION = 'dev'
+AWS_S3_SECURE_URLS = True
+STATIC_URL = '%s/%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME, AWS_LOCATION)
+STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
+
+COMPRESS_URL = STATIC_URL
diff --git a/config/settings/stage.py b/config/settings/stage.py
index e5a2495..90a9ace 100644
--- a/config/settings/stage.py
+++ b/config/settings/stage.py
@@ -223,3 +223,25 @@ ADMIN_URL = env('DJANGO_ADMIN_URL', default='trustee/')
 
 # Your production stuff: Below this line define 3rd party library settings
 # ------------------------------------------------------------------------------
+
+PAYMENT_PROVIDERS['gocardless']['redirect_url'] = 'https://test.maidstone-hackspace.org.uk'
+
+
+AWS_S3_SECURE_URLS = True
+AWS_ACCESS_KEY_ID = env('DIGITALOCEAN_SPACE_KEY')
+AWS_SECRET_ACCESS_KEY = env('DIGITALOCEAN_SPACE_SECRET')
+AWS_STORAGE_BUCKET_NAME = 'mhackspace'
+AWS_S3_ENDPOINT_URL = 'https://ams3.digitaloceanspaces.com'
+AWS_S3_OBJECT_PARAMETERS = {
+    'CacheControl': 'max-age=86400',
+}
+AWS_LOCATION = 'stage'
+
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, 'mysite/static'),
+]
+
+STATIC_URL = '%s/%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME, AWS_LOCATION)
+STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
+
+COMPRESS_URL = STATIC_URL
diff --git a/dev.yml b/dev.yml
index 898fc24..ccab009 100644
--- a/dev.yml
+++ b/dev.yml
@@ -67,3 +67,9 @@ services:
     command: celery -A mhackspace.celeryapp beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
     #command: sleep 1h 
 
+  bucket:
+    image: minio/minio
+    env_file: .env
+    volumes:
+      - ./buckets:/data
+    command: server /data
diff --git a/requirements/base.txt b/requirements/base.txt
index 1c9215f..efd5d0f 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -10,6 +10,11 @@ django==1.11.4
 # Configuration
 django-environ==0.4.3
 whitenoise==3.2.3
+# Static and Media Storage
+# ------------------------------------------------
+boto3
+django-storages==1.6.5
+# django-storages-redux==1.3.2
 
 
 # Forms
@@ -44,7 +49,10 @@ redis>=2.10.5
 
 rcssmin==1.0.6
 django-compressor==2.1.1
-django-sass-processor==0.5.4
+
+#fix for use with s3 buckets merged in master, so next release we can remove this
+#django-sass-processor==0.5.7
+git+https://github.com/jrief/django-sass-processor.git
 libsass==0.13.2
 lxml==3.7.3
 
@@ -67,9 +75,9 @@ django-filter==1.0.2
 coreapi
 # api libraries end
 
-#martor==1.2.5
+martor==1.2.5
 
-git+git://github.com/olymk2/django-markdown-editor.git
+#git+git://github.com/olymk2/django-markdown-editor.git
 
 # django-spirit
 django-djconfig
diff --git a/requirements/production.txt b/requirements/production.txt
index de6fc1a..493b750 100644
--- a/requirements/production.txt
+++ b/requirements/production.txt
@@ -9,10 +9,6 @@
 gevent==1.2.2
 gunicorn==19.7.1
 
-# Static and Media Storage
-# ------------------------------------------------
-boto==2.47.0
-django-storages-redux==1.3.2
 
 
 # Email backends for Mailgun, Postmark, SendGrid and more