# HG changeset patch # User cavaliet # Date 1360234583 -3600 # Node ID b20372cb23669ea21d74769522dbeef78e7d23bf # Parent daaafc916dc4c55cd584c5f90ae913f429190e21 update settings and config for login_url diff -r daaafc916dc4 -r b20372cb2366 .hgignore --- a/.hgignore Wed Feb 06 13:15:27 2013 +0100 +++ b/.hgignore Thu Feb 07 11:56:23 2013 +0100 @@ -12,3 +12,6 @@ ^web/static/media ^src/log\.txt$ + +syntax: regexp +^log$ \ No newline at end of file diff -r daaafc916dc4 -r b20372cb2366 src/egonomy/config.py.tmpl --- a/src/egonomy/config.py.tmpl Wed Feb 06 13:15:27 2013 +0100 +++ b/src/egonomy/config.py.tmpl Thu Feb 07 11:56:23 2013 +0100 @@ -6,7 +6,8 @@ WEB_URL = 'http://localhost/' STATIC_URL = BASE_URL + 'static/site/' -LOGIN_URL = BASE_URL + "ego/login/" +# if necessary +#EGONOMY_BASE_URL = BASE_URL + 'ego/' DEBUG = True diff -r daaafc916dc4 -r b20372cb2366 src/egonomy/settings.py --- a/src/egonomy/settings.py Wed Feb 06 13:15:27 2013 +0100 +++ b/src/egonomy/settings.py Thu Feb 07 11:56:23 2013 +0100 @@ -160,3 +160,9 @@ } from .config import * #@UnusedWildImport + +if not "EGONOMY_BASE_URL" in locals(): + EGONOMY_BASE_URL = BASE_URL + 'ego/' + +if not "LOGIN_URL" in locals(): + LOGIN_URL = EGONOMY_BASE_URL + 'login/' \ No newline at end of file