diff options
| -rw-r--r-- | rpkid/Makefile.in | 2 | ||||
| -rw-r--r-- | rpkid/portal-gui/default_settings.py | 42 | ||||
| -rw-r--r-- | rpkid/portal-gui/settings.py.in | 15 | ||||
| -rw-r--r-- | rpkid/rpki/gui/app/views.py | 3 |
4 files changed, 56 insertions, 6 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 3340c8ac..88c9acf5 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -79,7 +79,7 @@ DATA_FILES = portal-gui/routeviews.sh CONF_FILES = portal-gui/apache.conf ${SETTINGS} # automatically generated config files -SETTINGS=portal-gui/settings.py +SETTINGS=portal-gui/settings.py portal-gui/default_settings.py all:: ${POW_SO} rpki/relaxng.py myrpki.rng rpki/sql_schemas.py ${SCRIPTS} ${AUX_SCRIPTS} ${SETTINGS} ${BUILD_SCRIPTS} diff --git a/rpkid/portal-gui/default_settings.py b/rpkid/portal-gui/default_settings.py new file mode 100644 index 00000000..bbe1d54f --- /dev/null +++ b/rpkid/portal-gui/default_settings.py @@ -0,0 +1,42 @@ +""" +This module contains static configuration settings for the web portal. +""" + +__version__ = '$Id$' + +# must end with a slash! +STATIC_URL = '/media/' + +# where to email server errors +ADMINS = (('Administrator', 'root@localhost'),) + +LOGGING = { + 'version': 1, + 'formatters': { + 'verbose': { + # see http://docs.python.org/2.7/library/logging.html#logging.LogRecord + 'format': '%(levelname)s %(asctime)s %(name)s %(message)s' + }, + }, + 'handlers': { + 'stderr': { + 'class': 'logging.StreamHandler', + 'level': 'DEBUG', + 'formatter': 'verbose', + }, + 'mail_admins': { + 'level': 'ERROR', + 'class': 'django.utils.log.AdminEmailHandler', + }, + }, + 'loggers': { + 'django': { + 'level': 'ERROR', + 'handlers': ['stderr', 'mail_admins'], + }, + 'rpki.gui': { + 'level': 'DEBUG', + 'handlers': ['stderr'], + }, + }, +} diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in index ce10d8a5..0651886b 100644 --- a/rpkid/portal-gui/settings.py.in +++ b/rpkid/portal-gui/settings.py.in @@ -127,8 +127,13 @@ TEMPLATE_CONTEXT_PROCESSORS = ( # where to put static files STATIC_ROOT = '%(AC_DATAROOTDIR)s/rpki/media' -# must end with a slash! -STATIC_URL = '/media/' - -# where to email server errors -ADMINS = (('Administrator', 'root@localhost'),) +try: + from default_settings import * +except: + pass + +# allow local site to override any setting above +try: + from local_settings import * +except: + pass diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py index c165460c..a6b7f95f 100644 --- a/rpkid/rpki/gui/app/views.py +++ b/rpkid/rpki/gui/app/views.py @@ -26,6 +26,7 @@ import os.path from tempfile import NamedTemporaryFile import cStringIO import csv +import logging from django.contrib.auth.decorators import login_required from django.shortcuts import get_object_or_404, render, redirect @@ -50,6 +51,8 @@ from rpki.gui.cacheview.models import ROA from rpki.gui.routeview.models import RouteOrigin from rpki.gui.decorators import tls_required +logger = logging.getLogger(__name__) + def superuser_required(f): """Decorator which returns HttpResponseForbidden if the user does |