From 4eab630c94dbead2735ac889b3ff858c57a8baa8 Mon Sep 17 00:00:00 2001 From: Loic & Edelberto Date: Thu, 13 Mar 2014 10:19:33 -0300 Subject: [PATCH] urls and config --- myslice/configengine.py | 4 +++- myslice/settings.py | 6 ++++-- myslice/urls.py | 7 +++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/myslice/configengine.py b/myslice/configengine.py index 5ce52605..1a46e6d3 100644 --- a/myslice/configengine.py +++ b/myslice/configengine.py @@ -33,7 +33,7 @@ class ConfigEngine(object): default_manifold_admin_user = 'admin' default_manifold_admin_password = 'demo' - default_myslice_theme = 'onelab' + default_myslice_theme = 'fibre' def __init__ (self): @@ -48,7 +48,9 @@ class ConfigEngine(object): parser.add_section('googlemap') parser.set ('googlemap','api_key', None) + print os.path.join(ROOT,'myslice/myslice.ini') parser.read (os.path.join(ROOT,'myslice/myslice.ini')) + print parser self.config_parser=parser def __getattr__(self, section): diff --git a/myslice/settings.py b/myslice/settings.py index 21c28978..8fd5d9ab 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -23,9 +23,9 @@ except: # when deployed from a package # this code is run by collectstatic too, so we cannot # assume we have ./static present already -HTTPROOT="/usr/share/unfold" +HTTPROOT="/var/www/myslice" # the place to store local data, like e.g. the sqlite db -DATAROOT="/var/unfold" +DATAROOT="/var/www/myslice" # if not there, then we assume it's from a devel tree if not os.path.isdir (os.path.join(HTTPROOT,"static")): HTTPROOT=ROOT @@ -181,11 +181,13 @@ ROOT_URLCONF = 'myslice.urls' # Python dotted path to the WSGI application used by Django's runserver. WSGI_APPLICATION = 'unfold.wsgi.application' +#WSGI_APPLICATION = 'myslice.wsgi.application' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. + #os.path.join(HTTPROOT,"templates"), os.path.join(HTTPROOT,"templates"), ) diff --git a/myslice/urls.py b/myslice/urls.py index 0a811d97..d134d142 100644 --- a/myslice/urls.py +++ b/myslice/urls.py @@ -90,3 +90,10 @@ for aux in auxiliaries: urls.append ( url ( r'^%s/'%aux, include ('%s.urls'%aux ))) urlpatterns = patterns(*urls) + +# Shibboleth - Edelberto +urlpatterns += patterns('', + #url(r'^cafe/', 'plugins.cafe.edelberto.EdelbertoView.as_view()'), + url(r'^cafe/', 'plugins.cafe.edelberto.index'), +) + -- 2.43.0