Fixed web settings.

This commit is contained in:
Jonathan Piacenti 2015-01-16 08:06:09 -06:00
parent e3944552c5
commit b95ff4e976
4 changed files with 10 additions and 8 deletions

View file

@ -540,7 +540,7 @@ STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(GAME_DIR, "web", "static") STATIC_ROOT = os.path.join(GAME_DIR, "web", "static")
# Directories from which static files will be gathered from. # Directories from which static files will be gathered.
STATICFILES_DIRS = ( STATICFILES_DIRS = (
os.path.join(GAME_DIR, "web", "static_overrides"), os.path.join(GAME_DIR, "web", "static_overrides"),
os.path.join(EVENNIA_DIR, "web", "static"),) os.path.join(EVENNIA_DIR, "web", "static"),)
@ -625,7 +625,9 @@ except ImportError:
####################################################################### #######################################################################
# SECRET_KEY # SECRET_KEY
####################################################################### #######################################################################
# This is the salt for cryptographic hashing used by Django. # This is the signing key for the cookies generated by Evennia's
# web interface.
#
# It is a fallback for the SECRET_KEY setting in settings.py, which # It is a fallback for the SECRET_KEY setting in settings.py, which
# is randomly seeded when settings.py is first created. If copying # is randomly seeded when settings.py is first created. If copying
# from here, make sure to change it! # from here, make sure to change it!

View file

@ -86,7 +86,8 @@ TEMPLATE_DIRS = (
os.path.join(EVENNIA_DIR, "web", "templates", ACTIVE_TEMPLATE), os.path.join(EVENNIA_DIR, "web", "templates", ACTIVE_TEMPLATE),
os.path.join(EVENNIA_DIR, "web", "templates"),) os.path.join(EVENNIA_DIR, "web", "templates"),)
# The secret key is randomly seeded upon creation. It is used to # The secret key is randomly seeded upon creation. It is used to sign
# salt cryptographic keys. Don't change this once you have created users # Django's cookies. Do not share this with anyone. Changing it will
# and don't share it with anyone. # log out all active web browsing sessions. Game web client sessions
# may survive.
SECRET_KEY = {secret_key} SECRET_KEY = {secret_key}

View file

@ -1 +0,0 @@
__author__ = 'kelketek'

View file

@ -1,6 +1,6 @@
from django.conf.urls import url, include from django.conf.urls import url, include
from src.web.urls import urlpatterns from evennia.web.urls import urlpatterns
# #
# File that determines what each URL points to. This uses _Python_ regular # File that determines what each URL points to. This uses _Python_ regular
@ -25,4 +25,4 @@ patterns = [
# url(r'/desired/url/', view, name='example'), # url(r'/desired/url/', view, name='example'),
] ]
urlpatterns = patterns + urlpatterns urlpatterns = patterns + urlpatterns