diff --git a/app/create_db.py b/app/create_db.py index 84bea8b..5af57c0 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -401,7 +401,7 @@ def update_db_v_3_4_7(**kwargs): def update_ver(**kwargs): con, cur = get_cur() - sql = """update version set version = '3.4.9.1'; """ + sql = """update version set version = '3.4.9.2'; """ try: cur.execute(sql) con.commit() diff --git a/app/funct.py b/app/funct.py index 97ba72c..cd7e0c5 100644 --- a/app/funct.py +++ b/app/funct.py @@ -605,9 +605,9 @@ def check_new_version(): try: if proxy: proxyDict = { "https" : proxy, "http" : proxy } - response = requests.get('https://haproxy-wi.org/update.py?last_ver=1', verify=False, timeout=1, proxies=proxyDict) + response = requests.get('https://haproxy-wi.org/update.py?last_ver=1', timeout=1, proxies=proxyDict) else: - response = requests.get('https://haproxy-wi.org/update.py?last_ver=1', verify=False, timeout=1) + response = requests.get('https://haproxy-wi.org/update.py?last_ver=1', timeout=1) res = response.content.decode(encoding='UTF-8') except requests.exceptions.RequestException as e: diff --git a/app/login.py b/app/login.py index 65c1612..4bd7ce2 100644 --- a/app/login.py +++ b/app/login.py @@ -55,9 +55,9 @@ def ban(): c["ban"]["path"] = "/app/" c["ban"]["expires"] = expires.strftime("%a, %d %b %Y %H:%M:%S GMT") try: - funct.logging('locahost', login+' Failed log in', haproxywi=1, login=1) + funct.logging('locahost', login+' failed log in', haproxywi=1, login=1) except: - funct.logging('locahost', ' Failed log in', haproxywi=1) + funct.logging('locahost', ' Failed log in. Wrong username', haproxywi=1) print(c) print("Content-type: text/html\n") print('ban') diff --git a/app/templates/add.html b/app/templates/add.html index 6d305cf..94ff7f6 100644 --- a/app/templates/add.html +++ b/app/templates/add.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% block content %} +
-
-
-
-
- Create Listen +
+
+
+
+
+ Create Listen +
+
+ A "listen" section defines a complete proxy with its frontend and backend parts combined in one section. It is generally useful for TCP-only traffic. +
+
-
- A "listen" section defines a complete proxy with its frontend and backend parts combined in one section. It is generally useful for TCP-only traffic. +
+
+
+
+ Create HTTP Listen +
+
+ Create HTTP proxy +
+
+
+
+
+
+ Create SSL Listen +
+
+ Create HTTPS Proxy with the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTP traffic. You need have uploaded a PEM certificat +
+
+
+
+
+
+ Create HTTPS Listen +
+
+ Create HTTPS Proxy without the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTPS traffic +
-
-
+
+
+
+
+ Create Frontend +
+
+ A "frontend" section describes a set of listening sockets accepting client connections. + And forwards them to backend +
+
+
- Create Frontend + Create HTTP Frontend
- A "frontend" section describes a set of listening sockets accepting client connections. - And forwards them to backend -
+ Create HTTP Frontend +
+
+
+
+
+ Create SSL Frontend +
+
+ Create HTTPS Frontend with the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTP traffic. You need have uploaded a PEM certificat +
+
+
+
+
+
+ Create HTTPS Frontend +
+
+ Create HTTPS Frontend without the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTPS traffic +
+
-
+
+
+
+
+ Create Backend +
+
+ A "backend" section describes a set of servers to which the proxy will connect to forward incoming connections. +
+
+
+
+
- Create Backend + Create HTTP Backend
- A "backend" section describes a set of servers to which the proxy will connect to forward incoming connections. -
-
-
+ Create HTTP Backend +
+
+
+
+
+ Create SSL Backend +
+
+ Create HTTPS Backend with the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTP traffic. You need have uploaded a PEM certificat +
+
+
+
+
+
+ Create HTTPS Backend +
+
+ Create HTTPS Backend without the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTPS traffic +
+
{% if add %} @@ -724,7 +817,7 @@