decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

cleanup settings.py/local_settings.py/config.json

Browse source
This commit is contained in:
j 2011-11-02 23:29:20 +01:00
commit 2748ab6978
6 changed files with 68 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pandora/app/config.py
View file

@ -9,6 +9,8 @@ import time
import thread
from django.conf import settings
from django.contrib.auth.models import User
import ox.jsonc
from ox.utils import json
@ -24,10 +26,11 @@ def load_config():
config = None
if config:
config['site']['id'] = settings.SITEID
config['site']['name'] = settings.SITENAME
config['site']['sectionName'] = settings.SITENAME
config['site']['url'] = settings.URL
settings.SITENAME = config['site']['name']
settings.URL = config['site']['url']
settings.EMAIL_SUBJECT_PREFIX = '[%s]'%settings.SITENAME
settings.DEFAULT_FROM_EMAIL = config['site']['email']['system']
settings.SERVER_EMAIL = config['site']['email']['system']
config['site']['videoprefix'] = settings.VIDEO_PREFIX
config['keys'] = {}
@ -36,6 +39,11 @@ def load_config():
settings.CONFIG = config
admin = len(settings.CONFIG['userLevels']) - 1
settings.ADMIN = tuple([(u.username, u.email)
for u in User.objects.filter(profile__level=admin)])
settings.MANAGERS = settings.ADMINS
def reloader_thread():
_config_mtime = 0
while RUN_RELOADER: