pull SECRET_KEY from rpki.conf if present, otherwise generate a random value

merge remainder of settings.py into default_settings.py and remove settings.py.in

remove $top/buildtools/subst-vars.py since it was only used to generate settings.py from settings.py.in

move ${datarootdir}/default_settings.py to rpki.gui.default_settings

set DJANGO_SETTINGS_MODULE to rpki.gui.default_settings in ${datarootdir}/rpki/wsgi/rpki.wsgi


svn path=/trunk/; revision=5275

1 files changed, 0 insertions, 28 deletions

diff --git a/buildtools/subst-vars.py b/buildtools/subst-vars.py
deleted file mode 100755
index 5083c2dd..00000000
--- a/buildtools/subst-vars.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-"""
-Copyright (C) 2011  SPARTA, Inc., dba Cobham Analytic Solutions
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-"""
-
-
-import os, sys
-
-# pull out all AC_* environment variables into a dict to substitute in the input file
-d = {}
-for v in os.environ:
-    if v.startswith('AC_'):
-        d[v] = os.environ[v]
-
-sys.stdout.write(sys.stdin.read() % d)