diff --git a/app/add.py b/app/add.py index c22e5bba..b15bdbc4 100644 --- a/app/add.py +++ b/app/add.py @@ -142,16 +142,15 @@ if form.getvalue('mode') is not None: options_split += cookie if form.getvalue('dynamic'): options_split += " dynamic-cookie-key " + form.getvalue('dynamic-cookie-key')+"\n" - + + servers_split = "" if form.getvalue('servers') is not None: - servers = form.getvalue('servers') - i = servers.split("\n") - servers_split = "" - for j in i: - j = j.strip('\t\n\r') - servers_split += " server " + j + check + "\n" - else: - servers_split = "" + servers = form.getlist('servers') + server_port = form.getlist('server_port') + i = 0 + for server in servers: + servers_split += " server test " + server +":"+server_port[i]+ check + "\n" + i += 1 compression = form.getvalue("compression") cache = form.getvalue("cache") diff --git a/app/funct.py b/app/funct.py index c6840b8c..fa7a0ee8 100644 --- a/app/funct.py +++ b/app/funct.py @@ -456,7 +456,9 @@ def ssh_command(serv, commands, **kwargs): else: return stdout.read().decode(encoding='UTF-8') - print("
"+stderr.read().decode(encoding='UTF-8')+"
") + for line in stderr.read().decode(encoding='UTF-8'): + if line: + print("
"+line+"
") try: ssh.close() except: diff --git a/app/templates/add.html b/app/templates/add.html index e788c0ad..865c4b84 100644 --- a/app/templates/add.html +++ b/app/templates/add.html @@ -42,7 +42,11 @@
IP for bind listner, if empty will be assignet on all IPs. Start typing ip, or press down.
If you use VRRP keep in blank. If you assign an IP, the slave will not start
- + + Advanced: + Show Advanced settings + + Mode: @@ -72,7 +76,7 @@ - + Web acceleration(?): @@ -82,7 +86,7 @@ - + WAF(?): @@ -97,7 +101,7 @@ - + Optinons: @@ -153,7 +157,19 @@ Servers: - + + : + +
+ : + +
+ : + +
+ + +
@@ -223,7 +239,11 @@
IP for bind listner, if empty will be assignet on all IPs. Start typing ip, or press down.
If you use VRRP keep in blank. If you assign an IP, the slave will not start
- + + Advanced: + Show Advanced settings + + Mode: - + + Advanced: + Show Advanced settings + + Mode: @@ -362,7 +386,7 @@ - + Web acceleration(?): @@ -372,7 +396,7 @@ - + Optinons: @@ -387,8 +411,8 @@ -
+