oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Also update common

This commit is contained in:
Oliver Marks 2018-09-18 21:16:58 +01:00
parent 7e48a1f6ba
commit 88664d2a98
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/settings/common.py
View File

@ -296,8 +296,8 @@ STATICFILES_FINDERS = (
AWS_DEFAULT_ACL = "public-read"
AWS_S3_SECURE_URLS = False
AWS_ACCESS_KEY_ID = env("MINIO_ACCESS_KEY")
AWS_SECRET_ACCESS_KEY = env("MINIO_SECRET_KEY")
AWS_ACCESS_KEY_ID = env('BUCKET_ACCESS_KEY')
AWS_SECRET_ACCESS_KEY = env('BUCKET_SECRET_KEY')
AWS_STORAGE_BUCKET_NAME = "mhackspace-local"
AWS_S3_ENDPOINT_URL = "http://%s:9000" % socket.gethostbyname("bucket")
AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "max-age=86400"}

7
env.example
View File

@ -18,9 +18,10 @@ DJANGO_SECRET_KEY=iud%k99yw!e+z+c12uatugbn=&lsdyd(t_byk9)@dp@lj6*c*n
DJANGO_ALLOWED_HOSTS=.maidstone-hackspace.org.uk
# AWS Settings
DJANGO_AWS_ACCESS_KEY_ID=
DJANGO_AWS_SECRET_ACCESS_KEY=
DJANGO_AWS_STORAGE_BUCKET_NAME=
BUCKET_NAME=local
BUCKET_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
BUCKET_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
# Used with email
DJANGO_MAILGUN_API_KEY=