Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Evaluating django 1.3 settings, close #7255

  • Loading branch information...
commit 0d4676498693a667b41cdd1ca3527144c550fa45 1 parent a794385
Aleksandra Tarkowska authored
Showing with 2 additions and 7 deletions.
  1. +2 −7 components/tools/OmeroWeb/omeroweb/settings.py
View
9 components/tools/OmeroWeb/omeroweb/settings.py
@@ -143,18 +143,13 @@ def leave_none_unset(s):
CUSTOM_SETTINGS_MAPPINGS = {
"omero.web.public.user": ["PUBLIC_USER", None, leave_none_unset],
"omero.web.public.password": ["PUBLIC_PASSWORD", None, leave_none_unset],
- "omero.web.database_engine": ["DATABASE_ENGINE", None, leave_none_unset],
- "omero.web.database_host": ["DATABASE_HOST", None, leave_none_unset],
- "omero.web.database_name": ["DATABASE_NAME", None, leave_none_unset],
- "omero.web.database_password": ["DATABASE_PASSWORD", None, leave_none_unset],
- "omero.web.database_port": ["DATABASE_PORT", None, leave_none_unset],
- "omero.web.database_user": ["DATABASE_USER", None, leave_none_unset],
+ "omero.web.databases": ["DATABASES", '{}', json.loads],
"omero.web.admins": ["ADMINS", '[]', json.loads],
"omero.web.application_server": ["APPLICATION_SERVER", DEFAULT_SERVER_TYPE, check_server_type],
"omero.web.application_server.host": ["APPLICATION_SERVER_HOST", "0.0.0.0", str],
"omero.web.application_server.port": ["APPLICATION_SERVER_PORT", "4080", str],
"omero.web.static_url": ["STATIC_URL", "/static/", str],
- "omero.web.cache_backend": ["CACHE_BACKEND", None, leave_none_unset],
+ "omero.web.caches": ["CACHES", '{}', json.loads],
"omero.web.webgateway_cache": ["WEBGATEWAY_CACHE", None, leave_none_unset],
"omero.web.session_engine": ["SESSION_ENGINE", DEFAULT_SESSION_ENGINE, check_session_engine],
"omero.web.debug": ["DEBUG", "false", parse_boolean],
Please sign in to comment.
Something went wrong with that request. Please try again.