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

Changes to allow local bucket work inside and outside container

This commit is contained in:
Oliver Marks 2018-01-22 14:31:54 +00:00
parent 276a87c0b3
commit 52bab868ff
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.org
View File

@ -94,3 +94,8 @@ return response.status_code
#+RESULTS: #+RESULTS:
: 200 : 200
** Server
*** nginx
#+BEGIN_SRC bash
docker run -d --name=nginx olymk2/nginx -v /etc/nginx/sites-enabled/:/etc/nginx/sites-enabled/ -v /etc/letsencrypt/:/etc/letsencrypt/ -v /var/www/:/var/www/ -v sockets:/data/sockets -p 80:80 -p 443:443
#+END_SRC

6
config/settings/local.py
View File

@ -153,7 +153,9 @@ TEMPLATE_DEBUG = False
AWS_S3_SECURE_URLS = False AWS_S3_SECURE_URLS = False
AWS_ACCESS_KEY_ID = env('MINIO_ACCESS_KEY') AWS_ACCESS_KEY_ID = env('MINIO_ACCESS_KEY')
AWS_SECRET_ACCESS_KEY = env('MINIO_SECRET_KEY') AWS_SECRET_ACCESS_KEY = env('MINIO_SECRET_KEY')
AWS_S3_ENDPOINT_URL = 'http://bucket:9000'
AWS_S3_ENDPOINT_URL = 'http://%s:9000' % socket.gethostbyname('bucket')
# AWS_S3_SECURE_URLS = True # AWS_S3_SECURE_URLS = True
@ -169,4 +171,4 @@ AWS_S3_SECURE_URLS = True
STATIC_URL = '%s/%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME, AWS_LOCATION) STATIC_URL = '%s/%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME, AWS_LOCATION)
STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage' STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
COMPRESS_URL = STATIC_URL COMPRESS_URL = '%s/%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME, AWS_LOCATION)