0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

movie.mergeWith

Browse source
This commit is contained in:
j 2010-09-12 16:23:23 +02:00
commit 7493c8679c
2 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pandora/settings.py
View file

@ -30,10 +30,11 @@ location /protected/ {
ADMINS = (
('j', 'j@mailb.org'),
#('admin', 'admin@example.com'),
)
DEFAULT_FROM_EMAIL='bot@0xdb.org'
DEFAULT_FROM_EMAIL='admin@' + URL.split('/')[0]
#DEFAULT_FROM_EMAIL='admin@example.com'
MANAGERS = ADMINS
@ -44,7 +45,6 @@ DATABASE_PASSWORD = '' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
#CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
#rabbitmq connection settings
CELERY_RESULT_BACKEND = "database"
@ -140,7 +140,6 @@ VIDEO_PROFILE = '96p'
VIDEO_DERIVATIVES = []
VIDEO_H264 = True
#Pad.ma
#VIDEO_PROFILE = '480p'
#VIDEO_DERIVATIVES = ['96p', '270p', '360p']
@ -156,6 +155,9 @@ TRANSMISSON_PASSWORD='transmission'
#list of poster services, https://wiki.0x2620.org/wiki/pandora/posterservice
POSTER_SERVICES=[]
#0xdb.org
#POSTER_SERVICES=['http://data.0xdb.org/poster/']
#overwrite default settings with local settings
try:
from local_settings import *