From 889a0381e1cb83a29ace93351037ca2d1d049b26 Mon Sep 17 00:00:00 2001
From: David Schmitz <schmitz@lrz.de>
Date: Wed, 24 Jul 2019 17:20:53 +0200
Subject: [PATCH] fixed issues with setup view: options order mixed;
settings.py.dist needs to include settings_local import for working docker
settings defaults
---
flowspec/views.py | 6 +++---
flowspy/settings.py.dist | 11 +++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/flowspec/views.py b/flowspec/views.py
index fdf230b0..2f286786 100644
--- a/flowspec/views.py
+++ b/flowspec/views.py
@@ -941,9 +941,9 @@ def setup(request):
with open("flowspy/settings_local.py", "a") as f:
f.write("NETCONF_DEVICE = \"%s\"\n" % form.cleaned_data["netconf_device"])
- f.write("NETCONF_USER = \"%s\"\n" % form.cleaned_data["netconf_port"])
- f.write("NETCONF_PASS = \"%s\"\n" % form.cleaned_data["netconf_user"])
- f.write("NETCONF_PORT = %s\n" % form.cleaned_data["netconf_pass"])
+ f.write("NETCONF_USER = \"%s\"\n" % form.cleaned_data["netconf_user"])
+ f.write("NETCONF_PASS = \"%s\"\n" % form.cleaned_data["netconf_pass"])
+ f.write("NETCONF_PORT = %s\n" % form.cleaned_data["netconf_port"])
logger.error('TODO REMOVE: password: %s' % form.cleaned_data["password"])
return HttpResponseRedirect(reverse("welcome"))
diff --git a/flowspy/settings.py.dist b/flowspy/settings.py.dist
index be062610..2c980014 100644
--- a/flowspy/settings.py.dist
+++ b/flowspy/settings.py.dist
@@ -469,3 +469,14 @@ STATISTICS_PER_RULE__ADD_INITIAL_ZERO = True
##############################################################################
##############################################################################
+#MYSETTING1="default"
+#from settings_local import *
+from flowspy.settings_local import *
+
+#print "MYSETTING1="+MYSETTING1
+#print("MYSETTING1="+MYSETTING1, file=sys.stderr)
+#print "debug settings.NOTIFY_ADMIN_MAILS="+str(NOTIFY_ADMIN_MAILS)
+
+##############################################################################
+##############################################################################
+
--
GitLab