diff options
Diffstat (limited to 'rpkid/portal-gui')
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 6 | ||||
| -rw-r--r-- | rpkid/portal-gui/settings.py (renamed from rpkid/portal-gui/settings.py.in) | 24 |
2 files changed, 7 insertions, 23 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index 7eb2e572..9e7fc85f 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -24,7 +24,7 @@ INSTDIR=${DESTDIR}$(datarootdir)/rpki SYSCONFDIR=${DESTDIR}${sysconfdir}/rpki # automatically built sources -BUILD=apache.conf +BUILD=apache.conf local_settings.py all: $(BUILD) @@ -53,6 +53,7 @@ install: $(BUILD) ${INSTALL} -m 644 apache.conf $(SYSCONFDIR)/apache.conf ${INSTALL} -m 644 rpki.wsgi $(INSTDIR)/wsgi/rpki.wsgi ${INSTALL} -m 644 settings.py ${SYSCONFDIR} + ${INSTALL} -m 644 local_settings.py ${SYSCONFDIR} # this would be better handled with "django-admin collectstatic" but makes the install # process harder for the end user. ${INSTALL} -m 644 $(srcdir)/../rpki/gui/app/static/css/* $(INSTDIR)/media/css @@ -61,7 +62,8 @@ install: $(BUILD) deinstall uninstall: rm -rf $(INSTDIR)/media $(INSTDIR)/wsgi - rm -rf $(SYSCONFDIR)/apache.conf $(SYSCONFDIR)/settings.py $(SYSCONFDIR)/settings.pyc + rm -rf $(SYSCONFDIR)/apache.conf $(SYSCONFDIR)/settings.py $(SYSCONFDIR)/settings.pyc \ + $(SYSCONFDIR)/local_settings.py $(SYSCONFDIR)/settings.pyc test: @true diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py index 8246304c..ee4b5cee 100644 --- a/rpkid/portal-gui/settings.py.in +++ b/rpkid/portal-gui/settings.py @@ -1,23 +1,14 @@ -# -# Sample Django settings.py for running the RPKI portal gui. This -# template was written for Django 1.3. -# -# DO NOT EDIT! This file is automatically generated from -# settings.py.in - +# DO NOT EDIT! Modifications should be placed in local_settings.py __version__ = '$Id$' import rpki.config import os.path +from local_settings import * DEBUG = True TEMPLATE_DEBUG = DEBUG -# needs to be set prior to the call to rpki.config.parser so it knows -# where to find the system rpki.conf -rpki.config.default_dirname = '%(AC_SYSCONFDIR)s' - # load the sql authentication bits from the system rpki.conf rpki_config = rpki.config.parser(section='web_portal') @@ -36,10 +27,7 @@ def get_conv(): from MySQLdb.converters import conversions import types conv = conversions.copy() - # WARNING: the extra percents in the following line are due to the fact - # that this entire script is used as a format string to generate - # settings.py - conv[types.LongType] = lambda x, conv: "0x%%x" %% x + conv[types.LongType] = lambda x, conv: "0x%x" % x return conv DATABASES = { @@ -78,9 +66,6 @@ def select_tz(): # system time zone. TIME_ZONE = select_tz() -# Make this unique, and don't share it with anybody. -SECRET_KEY = '%(AC_SECRET_KEY)s' - # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', @@ -127,8 +112,5 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.static" ) -# where to put static files -STATIC_ROOT = '%(AC_DATAROOTDIR)s/rpki/media' - # must end with a slash! STATIC_URL = '/media/' |