diff options
| author | Michael Elkins <melkins@tislabs.com> | 2013-04-04 17:20:37 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2013-04-04 17:20:37 +0000 |
| commit | debe36911825690df0ea999630ef7fd54a69990a (patch) | |
| tree | 741d2ab4edd921a91c62ae1ca416fb96b20b6c20 /configure | |
| parent | 1ca9da5841168ee1f3ef3d45ccdcdf46357c5e21 (diff) | |
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
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -604,7 +604,6 @@ LIBOBJS WSGI_PROCESS_GROUP WSGI_DAEMON_PROCESS DJANGO_ADMIN -SECRET_KEY OPENSSL_SO_GLOB OPENSSL_CONFIG_COMMAND TOP_LEVEL_SUBDIRS @@ -4878,10 +4877,6 @@ fi if test $build_ca_tools = yes then - # Source: http://blog.leosoto.com/2008/04/django-secretkey-generation.html - SECRET_KEY=`$PYTHON -c 'import random; print "".join(random.choice("abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)") for i in range(50))'` - - # There is no standard name for this tool, so check for it. for ac_prog in django-admin django-admin.py do |