Settings changes

This commit is contained in:
Fergal Moran
2015-11-01 17:02:43 +00:00
parent 2d883f5eb0
commit d53c90486e
9 changed files with 73 additions and 151 deletions

4
.gitignore vendored
View File

@@ -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

View File

@@ -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'

55
dss/localsettings.py Normal file
View File

@@ -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', '')

View File

@@ -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',
},
}

View File

@@ -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.

6
dss/storagesettings.py Normal file
View File

@@ -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/'

View File

@@ -1,10 +0,0 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': 'dss_test.db',
'USER': '',
'PASSWORD': '',
'HOST': '',
'PORT': '',
}
}

10
spa/models/blog.py Normal file
View File

@@ -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()