From d53c90486e94bc38cd7bc1d8c536749159ba9006 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Sun, 1 Nov 2015 17:02:43 +0000 Subject: [PATCH] Settings changes --- .gitignore | 4 +- dss/localsettings.initial.py | 41 --------- dss/localsettings.py | 55 +++++++++++ dss/pipelinesettings.py | 91 ------------------- dss/settings.py | 7 +- dss/storagesettings.py | 6 ++ dss/test_settings.py | 10 -- .../__init__.cpython-34.pyc.139657446244720 | 0 spa/models/blog.py | 10 ++ 9 files changed, 73 insertions(+), 151 deletions(-) delete mode 100755 dss/localsettings.initial.py create mode 100644 dss/localsettings.py delete mode 100755 dss/pipelinesettings.py create mode 100644 dss/storagesettings.py delete mode 100755 dss/test_settings.py delete mode 100644 spa/models/__pycache__/__init__.cpython-34.pyc.139657446244720 create mode 100644 spa/models/blog.py diff --git a/.gitignore b/.gitignore index b68b21f..4558bcb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,7 @@ media/* build/* _working/* static/CACHE/* -dss/localsettings.py -dss/storagesettings.py -dss/celery_settings.py +dss/devsettings.py dss.conf dss/debugsettings.py mysql diff --git a/dss/localsettings.initial.py b/dss/localsettings.initial.py deleted file mode 100755 index 0867673..0000000 --- a/dss/localsettings.initial.py +++ /dev/null @@ -1,41 +0,0 @@ -import os - -DEBUG = True -if os.name == 'posix': - DSS_TEMP_PATH = "/tmp/" - DSS_LAME_PATH = "sox" - DSS_WAVE_PATH = "wav2png" -else: - DSS_TEMP_PATH = "d:\\temp\\" - DSS_LAME_PATH = "D:\\Apps\\lame\\lame.exe" - DSS_WAVE_PATH = "d:\\Apps\\waveformgen.exe" - -DATABASE_NAME = 'deepsouthsounds' -DATABASE_USER = 'deepsouthsounds' -DATABASE_PASSWORD = '' -# DATABASE_HOST = '' - -PIPELINE_YUI_BINARY = "" -FACEBOOK_APP_SECRET = '' - -JS_SETTINGS = { - 'CHAT_HOST': "ext-test.deepsouthsounds.com:8081", - 'API_URL': "/api/v1/", - 'LIVE_STREAM_URL': "radio.deepsouthsounds.com", - 'LIVE_STREAM_PORT': "8000", - 'LIVE_STREAM_MOUNT': "mp3", - 'DEFAULT_AUDIO_VOLUME': "50", - 'SM_DEBUG_MODE': DEBUG, - 'LIVE_STREAM_INFO_URL': "radio.deepsouthsounds.com:8000/mp3" -} -""" -WAVEFORM_URL = 'http://waveforms.podnoms.com/' -IMAGE_URL = 'http://images.podnoms.com/' -STATIC_URL = 'http://static.podnoms.com/' -""" -IMAGE_URL = 'http://ext-test.deepsouthsounds.com:8000/media/' -GOOGLE_ANALYTICS_CODE = '' -SENDFILE_BACKEND = 'sendfile.backends.development' -#SENDFILE_BACKEND = 'sendfile.backends.xsendfile' -#SENDFILE_BACKEND = 'sendfile.backends.nginx' - diff --git a/dss/localsettings.py b/dss/localsettings.py new file mode 100644 index 0000000..e14e7b0 --- /dev/null +++ b/dss/localsettings.py @@ -0,0 +1,55 @@ +import os +from dss import devsettings + +DEBUG = True +DSS_TEMP_PATH = os.environ.get('DSS_TEMP_PATH', '/tmp/') +DSS_LAME_PATH = os.environ.get('DSS_LAME_PATH', '/usr/bin/sox') +DSS_WAVE_PATH = os.environ.get('DSS_WAVE_PATH', + '/home/fergalm/Dropbox/development/deepsouthsounds.com/dss.lib/wav2png/bin/Linux/wav2png') +GEOIP_PATH = os.environ.get('GEOIP_PATH', '/home/fergalm/Dropbox/Private/deepsouthsounds.com/working/geolite') + +DATABASE_PASSWORD = os.environ.get('DATABASE_PASSWORD', 'deepsouthsounds') +DATABASE_NAME = os.environ.get('DATABASE_NAME', 'deepsouthsounds') +DATABASE_USER = os.environ.get('DATABASE_USER', 'deepsouthsounds') +DATABASE_HOST = os.environ.get('DATABASE_HOST', 'localhost') + +STATIC_URL = '/assets/' +MEDIA_ROOT = os.environ.get('MEDIA_ROOT', '/files/media') +STATIC_ROOT = os.environ.get('STATIC_ROOT', '/files/static') +CACHE_ROOT = os.environ.get('CACHE_ROOT', '/files/cache') + +MEDIA_URL = os.environ.get('MEDIA_URL', 'http://deepsouthsounds.com/media/') # '{0}media/'.format(CDN_URL) + +REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost') +BROKER_URL = os.environ.get('BROKER_URL', 'amqp://guest:guest@localhost:5672//') +CELERY_ACCEPT_CONTENT = ['pickle', 'msgpack', 'json'] + +SECRET_KEY = os.environ.get('SECRET_KEY', devsettings.SECRET_KEY) +LIVE_ENABLED = os.environ.get('LIVE_ENABLED', False) + +ICE_HOST = os.environ.get('ICE_HOST', 'localhost') +ICE_MOUNT = os.environ.get('ICE_MOUNT =', 'dss') +ICE_PORT = os.environ.get('ICE_PORT', 8000) + +RADIO_HOST = os.environ.get('RADIO_HOST', 'localhost') +RADIO_PORT = os.environ.get('RADIO_PORT', 8888) + +MANDRILL_API_KEY = os.environ.get('MANDRILL_API_KEY', '') + +SOCIAL_AUTH_FACEBOOK_KEY = os.environ.get('SOCIAL_AUTH_FACEBOOK_KEY', '') +SOCIAL_AUTH_FACEBOOK_SECRET = os.environ.get('SOCIAL_AUTH_FACEBOOK_SECRET', '') + +SOCIAL_AUTH_TWITTER_KEY = os.environ.get('SOCIAL_AUTH_TWITTER_KEY', '') +SOCIAL_AUTH_TWITTER_SECRET = os.environ.get('SOCIAL_AUTH_TWITTER_SECRET', '') + +SOCIAL_AUTH_GOOGLE_OAUTH_KEY = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH_KEY', '') +SOCIAL_AUTH_GOOGLE_OAUTH_SECRET = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH_SECRET', '') + +SOCIAL_AUTH_GOOGLE_PLUS_KEY = os.environ.get('SOCIAL_AUTH_GOOGLE_PLUS_KEY', '') +SOCIAL_AUTH_GOOGLE_PLUS_SECRET = os.environ.get('SOCIAL_AUTH_GOOGLE_PLUS_SECRET', '') + +DSS_DB_BACKUP_KEY = os.environ.get('DSS_DB_BACKUP_KEY', '') +DSS_DB_BACKUP_SECRET = os.environ.get('DSS_DB_BACKUP_SECRET', '') +DSS_DB_BACKUP_TOKEN = os.environ.get('DSS_DB_BACKUP_TOKEN', '') + +AZURE_ACCOUNT_KEY = os.environ.get('AZURE_ACCOUNT_KEY', '') diff --git a/dss/pipelinesettings.py b/dss/pipelinesettings.py deleted file mode 100755 index e107b52..0000000 --- a/dss/pipelinesettings.py +++ /dev/null @@ -1,91 +0,0 @@ -iPIPELINE_TEMPLATE_FUNC = "_.template" - -PIPELINE_COMPILERS = ( - 'pipeline.compilers.coffee.CoffeeScriptCompiler', -) - -PIPELINE_CSS = { - 'css': { - 'source_filenames': ( - 'css/dss.overrides.css', - - 'css/ace/dropzone.css', - 'css/ace/uncompressed/jquery.gritter.css', - 'css/ace/uncompressed/bootstrap.css', - 'css/ace/uncompressed/ace.css', - 'css/ace/uncompressed/ace-ie.css', - 'css/ace/uncompressed/ace-skins.css', - 'css/ace/uncompressed/font-awesome.css', - 'css/ace/uncompressed/fullcalendar.css', - 'css/ace/uncompressed/bootstrap-editable.css', - - 'css/jasny-bootstrap.css', - 'css/select2.css', - 'css/jquery.fileupload-ui.css', - 'css/peneloplay.css', - 'css/toastr.css', - 'css/dss.main.css', - ), - 'output_filename': 'css/site.css' - } -} - -PIPELINE_JS = { - 'templates': { - 'source_filenames': ( - 'js/dss/templates/*.jst', - ), - 'variant': 'datauri', - 'output_filename': 'js/t.js', - }, - - 'lib': { - 'source_filenames': ( - 'js/lib/jquery.js', - 'js/lib/jquery-ui.js', - - 'js/lib/moment.js', - 'js/lib/typeahead.js', - - 'js/lib/sm/soundmanager2.js', - - 'js/lib/underscore.js', - 'js/lib/underscore.templatehelpers.js', - 'js/lib/backbone.js', - 'js/lib/backbone.syphon.js', - 'js/lib/backbone.associations.js', - 'js/lib/backbone.marionette.js', - - 'js/lib/ace/uncompressed/bootstrap.js', - 'js/lib/ace/uncompressed/ace.js', - 'js/lib/ace/uncompressed/ace-elements.js', - 'js/lib/ace/uncompressed/select2.js', - 'js/lib/ace/uncompressed/fuelux/fuelux.wizard.js', - 'js/lib/ace/ace/elements.wizard.js', - 'js/lib/ace/uncompressed/bootstrap-wysiwyg.js', - 'js/lib/ace/uncompressed/jquery.gritter.js', - 'js/lib/ace/uncompressed/dropzone.js', - 'js/lib/ace/uncompressed/fullcalendar.js', - 'js/lib/ace/uncompressed/x-editable/bootstrap-editable.js', - 'js/lib/ace/uncompressed/x-editable/ace-editable.js', - - 'js/lib/ajaxfileupload.js', - 'js/lib/jasny.fileinput.js', - 'js/lib/jquery.fileupload.js', - 'js/lib/jquery.fileupload-process.js', - 'js/lib/jquery.fileupload-audio.js', - 'js/lib/jquery.fileupload-video.js', - 'js/lib/jquery.fileupload-validate.js', - 'js/lib/jquery.fileupload-ui.js', - 'js/lib/jquery.fileupload-image.js', - 'js/lib/jquery.iframe-transport.js', - 'js/lib/jquery.ui.widget.js', - 'js/lib/toastr.js', - - 'js/dss/*.coffee', - 'js/dss/**/*.coffee', - 'js/dss/apps/**/**/*.coffee', - ), - 'output_filename': 'js/a.js', - }, -} diff --git a/dss/settings.py b/dss/settings.py index 305ee76..fd0f69a 100755 --- a/dss/settings.py +++ b/dss/settings.py @@ -168,12 +168,7 @@ if DEBUG: REALTIME_HEADERS = { 'content-type': 'application/json' } -TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' -if 'test' in sys.argv: - try: - from .test_settings import * - except ImportError: - pass + REST_FRAMEWORK = { # Use hyperlinked styles by default. diff --git a/dss/storagesettings.py b/dss/storagesettings.py new file mode 100644 index 0000000..2e30c6b --- /dev/null +++ b/dss/storagesettings.py @@ -0,0 +1,6 @@ +from dss import localsettings + +AZURE_ACCOUNT_NAME = 'dsscdn' +AZURE_CONTAINER = 'media' +AZURE_ACCOUNT_KEY = localsettings.AZURE_ACCOUNT_KEY +AZURE_ITEM_BASE_URL = 'https://dsscdn.blob.core.windows.net/' diff --git a/dss/test_settings.py b/dss/test_settings.py deleted file mode 100755 index 5fc6de2..0000000 --- a/dss/test_settings.py +++ /dev/null @@ -1,10 +0,0 @@ -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': 'dss_test.db', - 'USER': '', - 'PASSWORD': '', - 'HOST': '', - 'PORT': '', - } -} diff --git a/spa/models/__pycache__/__init__.cpython-34.pyc.139657446244720 b/spa/models/__pycache__/__init__.cpython-34.pyc.139657446244720 deleted file mode 100644 index e69de29..0000000 diff --git a/spa/models/blog.py b/spa/models/blog.py new file mode 100644 index 0000000..641e93b --- /dev/null +++ b/spa/models/blog.py @@ -0,0 +1,10 @@ +from spa.models import BaseModel, UserProfile +from django.db import models + + +class Blog(BaseModel): + user = models.ForeignKey(UserProfile, null=True, blank=True) + date_created = models.DateField(auto_now=True) + + title = models.CharField(max_length=1024) + body = models.TextField()