remove s3 config from stage

This commit is contained in:
Oly 2017-02-15 19:28:59 +00:00
parent 17703bcb24
commit 134a5b0982
2 changed files with 10 additions and 8 deletions

View File

@ -11,14 +11,19 @@ pipeline:
- USE_DOCKER=yes - USE_DOCKER=yes
- DJANGO_SETTINGS_MODULE=config.settings.test - DJANGO_SETTINGS_MODULE=config.settings.test
commands: commands:
- echo $DRONE_BUILD_DIR
- echo $WORKSPACE
- cp -n env.example .env - cp -n env.example .env
- ls -la /drone/src/
- ls -la /drone/src/requirements/
- pip install -r ./requirements/test.txt - pip install -r ./requirements/test.txt
- python manage.py test mhackspace --verbosity 2 - python manage.py test mhackspace --verbosity 2
publish:
image: appleboy/drone-ssh
host: maidstone-hackspace.org.uk
# user: root
# password: 1234
port: 22
script:
- echo 'to be added'
services: services:
mailhog: mailhog:
image: mailhog/mailhog image: mailhog/mailhog

View File

@ -2,7 +2,6 @@
""" """
Production Configurations Production Configurations
- Use Amazon's S3 for storing static files and uploaded media
- Use mailgun to send emails - Use mailgun to send emails
- Use Redis for cache - Use Redis for cache
@ -10,7 +9,6 @@ Production Configurations
""" """
from __future__ import absolute_import, unicode_literals from __future__ import absolute_import, unicode_literals
from boto.s3.connection import OrdinaryCallingFormat
from django.utils import six from django.utils import six
@ -78,7 +76,6 @@ AWS_SECRET_ACCESS_KEY = env('DJANGO_AWS_SECRET_ACCESS_KEY')
AWS_STORAGE_BUCKET_NAME = env('DJANGO_AWS_STORAGE_BUCKET_NAME') AWS_STORAGE_BUCKET_NAME = env('DJANGO_AWS_STORAGE_BUCKET_NAME')
AWS_AUTO_CREATE_BUCKET = True AWS_AUTO_CREATE_BUCKET = True
AWS_QUERYSTRING_AUTH = False AWS_QUERYSTRING_AUTH = False
AWS_S3_CALLING_FORMAT = OrdinaryCallingFormat()
# AWS cache settings, don't change unless you know what you're doing: # AWS cache settings, don't change unless you know what you're doing:
AWS_EXPIRY = 60 * 60 * 24 * 7 AWS_EXPIRY = 60 * 60 * 24 * 7
@ -93,7 +90,7 @@ AWS_HEADERS = {
# URL that handles the media served from MEDIA_ROOT, used for managing # URL that handles the media served from MEDIA_ROOT, used for managing
# stored files. # stored files.
MEDIA_URL = 'https://s3.amazonaws.com/%s/' % AWS_STORAGE_BUCKET_NAME # MEDIA_URL = ''
# Static Assets # Static Assets