diff --git a/evennia/settings_default.py b/evennia/settings_default.py index 2e213ba3d4..1fcc06f15b 100644 --- a/evennia/settings_default.py +++ b/evennia/settings_default.py @@ -540,7 +540,7 @@ STATIC_URL = '/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 = ( os.path.join(GAME_DIR, "web", "static_overrides"), os.path.join(EVENNIA_DIR, "web", "static"),) @@ -625,7 +625,9 @@ except ImportError: ####################################################################### # 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 # is randomly seeded when settings.py is first created. If copying # from here, make sure to change it! diff --git a/game_template/server/conf/settings.py b/game_template/server/conf/settings.py index 975cd0ad2b..d149c577d9 100644 --- a/game_template/server/conf/settings.py +++ b/game_template/server/conf/settings.py @@ -86,7 +86,8 @@ TEMPLATE_DIRS = ( os.path.join(EVENNIA_DIR, "web", "templates", ACTIVE_TEMPLATE), os.path.join(EVENNIA_DIR, "web", "templates"),) -# The secret key is randomly seeded upon creation. It is used to -# salt cryptographic keys. Don't change this once you have created users -# and don't share it with anyone. +# The secret key is randomly seeded upon creation. It is used to sign +# Django's cookies. Do not share this with anyone. Changing it will +# log out all active web browsing sessions. Game web client sessions +# may survive. SECRET_KEY = {secret_key} diff --git a/game_template/web/examples/__init__.py b/game_template/web/examples/__init__.py deleted file mode 100644 index cdcf9604a4..0000000000 --- a/game_template/web/examples/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'kelketek' diff --git a/game_template/web/examples/urls.py b/game_template/web/urls.py similarity index 91% rename from game_template/web/examples/urls.py rename to game_template/web/urls.py index 58754f51c9..18d03c6cf1 100644 --- a/game_template/web/examples/urls.py +++ b/game_template/web/urls.py @@ -1,6 +1,6 @@ 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 @@ -25,4 +25,4 @@ patterns = [ # url(r'/desired/url/', view, name='example'), ] -urlpatterns = patterns + urlpatterns \ No newline at end of file +urlpatterns = patterns + urlpatterns