mirror of
https://github.com/fergalmoran/dss.api.git
synced 2026-01-06 00:23:57 +00:00
Fixed merge conflicts
This commit is contained in:
55
dss/localsettings.py
Normal file
55
dss/localsettings.py
Normal 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', '/mnt/dev/deepsouthsounds.com/media')
|
||||
STATIC_ROOT = os.environ.get('STATIC_ROOT', '/home/fergalm/Dropbox/development/deepsouthsounds.com/cache/static')
|
||||
CACHE_ROOT = os.environ.get('CACHE_ROOT', '/mnt/dev/deepsouthsounds.com/cache')
|
||||
|
||||
MEDIA_URL = os.environ.get('MEDIA_URL', 'http://localhost/DSSMedia/') # '{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', devsettings.SOCIAL_AUTH_FACEBOOK_KEY)
|
||||
SOCIAL_AUTH_FACEBOOK_SECRET = os.environ.get('SOCIAL_AUTH_FACEBOOK_SECRET', devsettings.SOCIAL_AUTH_FACEBOOK_SECRET)
|
||||
|
||||
SOCIAL_AUTH_TWITTER_KEY = os.environ.get('SOCIAL_AUTH_TWITTER_KEY', devsettings.SOCIAL_AUTH_TWITTER_KEY)
|
||||
SOCIAL_AUTH_TWITTER_SECRET = os.environ.get('SOCIAL_AUTH_TWITTER_SECRET', devsettings.SOCIAL_AUTH_TWITTER_SECRET)
|
||||
|
||||
SOCIAL_AUTH_GOOGLE_OAUTH_KEY = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH_KEY', devsettings.SOCIAL_AUTH_GOOGLE_OAUTH_KEY)
|
||||
SOCIAL_AUTH_GOOGLE_OAUTH_SECRET = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH_SECRET', devsettings.SOCIAL_AUTH_GOOGLE_OAUTH_SECRET)
|
||||
|
||||
SOCIAL_AUTH_GOOGLE_PLUS_KEY = os.environ.get('SOCIAL_AUTH_GOOGLE_PLUS_KEY', devsettings.SOCIAL_AUTH_GOOGLE_PLUS_KEY)
|
||||
SOCIAL_AUTH_GOOGLE_PLUS_SECRET = os.environ.get('SOCIAL_AUTH_GOOGLE_PLUS_SECRET', devsettings.SOCIAL_AUTH_GOOGLE_PLUS_SECRET)
|
||||
|
||||
DSS_DB_BACKUP_KEY = os.environ.get('DSS_DB_BACKUP_KEY', devsettings.DSS_DB_BACKUP_KEY)
|
||||
DSS_DB_BACKUP_SECRET = os.environ.get('DSS_DB_BACKUP_SECRET', devsettings.DSS_DB_BACKUP_SECRET)
|
||||
DSS_DB_BACKUP_TOKEN = os.environ.get('DSS_DB_BACKUP_TOKEN', devsettings.DSS_DB_BACKUP_TOKEN)
|
||||
|
||||
AZURE_ACCOUNT_KEY = os.environ.get('AZURE_ACCOUNT_KEY', devsettings.AZURE_ACCOUNT_KEY)
|
||||
6
dss/storagesettings.py
Normal file
6
dss/storagesettings.py
Normal 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/'
|
||||
Reference in New Issue
Block a user