diff --git a/lolaws/local_settings_TEMPLATE.py b/lolaws/local_settings_TEMPLATE.py new file mode 100644 index 0000000..3915e43 --- /dev/null +++ b/lolaws/local_settings_TEMPLATE.py @@ -0,0 +1,36 @@ +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': 'lolaws', + 'USER': 'lolaws', + 'PASSWORD': 'SETME', + 'HOST': 'SETME', + 'PORT': '', + } +} + +AWS_ACCESS_KEY_ID = "SETME" +AWS_SECRET_ACCESS_KEY = "SETME" +AWS_STORAGE_BUCKET_NAME = "SETME" + +# S3 +STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage' +DEFAULT_FILE_STORAGE = 'storages.backends.s3.S3Storage' + +STATIC_URL = 'http://'+AWS_STORAGE_BUCKET_NAME+'.s3.amazonaws.com/' +ADMIN_MEDIA_PREFIX = STATIC_URL + "admin/" + +AWS_HEADERS = { + 'Cache-Control': 'max-age=86400', +} + +from S3 import CallingFormat +AWS_CALLING_FORMAT = CallingFormat.SUBDOMAIN + +# email +EMAIL_BACKEND = 'django_ses.SESBackend' +DEFAULT_FROM_EMAIL = 'lolaws ' +EMAIL_SUBJECT_PREFIX = '[lolaws] ' + + + diff --git a/lolaws/settings.py b/lolaws/settings.py index c4b4a82..74254af 100644 --- a/lolaws/settings.py +++ b/lolaws/settings.py @@ -62,7 +62,7 @@ # URL prefix for static files. # Example: "http://media.lawrence.com/static/" -STATIC_URL = 'http://BUCKETNAME.s3.amazonaws.com/' +STATIC_URL = '/static/' # URL prefix for admin static files -- CSS, JavaScript and images. # Make sure to use a trailing slash. @@ -154,28 +154,6 @@ } } - -# s3 storage -STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage' - -#DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' -DEFAULT_FILE_STORAGE = 'storages.backends.s3.S3Storage' - -AWS_ACCESS_KEY_ID = "SETME" -AWS_SECRET_ACCESS_KEY = "SETME" -AWS_STORAGE_BUCKET_NAME = "SETME" -STATIC_URL = 'http://'+AWS_STORAGE_BUCKET_NAME+'.s3.amazonaws.com/' -ADMIN_MEDIA_PREFIX = STATIC_URL + "admin/" -from S3 import CallingFormat -AWS_CALLING_FORMAT = CallingFormat.SUBDOMAIN -AWS_HEADERS = { - 'Cache-Control': 'max-age=86400', -} - -EMAIL_BACKEND = 'django_ses.SESBackend' -DEFAULT_FROM_EMAIL = 'lolaws ' -EMAIL_SUBJECT_PREFIX = '[lolaws] ' - try: from local_settings import * except ImportError: