From c8b1822e8ae63d577cb529bfb12fd4057b69d1d5 Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Sat, 28 Dec 2024 11:09:20 +0300
Subject: [PATCH] v8.1.3: Update default versions for HAProxy and Nginx

Updated the default HAProxy version to 3.1.1-1 and Nginx experimental version to 1.4.0 in the templates and service installation logic. This ensures compatibility with the latest releases and improves functionality.
---
 app/modules/service/installation.py | 2 +-
 app/templates/install.html          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/modules/service/installation.py b/app/modules/service/installation.py
index 16638e3a..f2718616 100644
--- a/app/modules/service/installation.py
+++ b/app/modules/service/installation.py
@@ -127,7 +127,7 @@ def generate_haproxy_inv(json_data: ServiceInstall, installed_service: str) -> o
 	stats_password = sql.get_setting('haproxy_stats_password')
 	haproxy_dir = sql.get_setting('haproxy_dir')
 	container_name = sql.get_setting('haproxy_container_name')
-	haproxy_ver = '3.1.0-1'
+	haproxy_ver = '3.1.1-1'
 	is_docker = json_data['services']['haproxy']['docker']
 
 	for v in json_data['servers']:
diff --git a/app/templates/install.html b/app/templates/install.html
index 38071179..320668fb 100644
--- a/app/templates/install.html
+++ b/app/templates/install.html
@@ -39,8 +39,8 @@
 				</td>
 				<td class="padding10 first-collumn" style="width: 20%;">
 					{% set values = dict() %}
-					{% set values = {'2.6.14-1':'2.6.14-1','2.7.9-1':'2.7.9-1','2.8.1-1':'2.8.1-1','2.9.6-1':'2.9.6-1','3.0.3-1':'3.0.3-1','3.1.0-1':'3.1.0-1'} %}
-					{{ select('hapver',  values=values, selected='3.1.0-1', required='required') }}
+					{% set values = {'2.6.14-1':'2.6.14-1','2.7.9-1':'2.7.9-1','2.8.1-1':'2.8.1-1','2.9.6-1':'2.9.6-1','3.0.3-1':'3.0.3-1','3.1.1-1':'3.1.1-1'} %}
+					{{ select('hapver',  values=values, selected='3.1.1-1', required='required') }}
 				</td>
 				<td class="padding10 first-collumn">
 					<select autofocus required name="haproxyaddserv" id="haproxyaddserv">
@@ -187,8 +187,8 @@
                 <td id="cur_nginx_exp_ver" class="padding10 first-collumn"></td>
                 <td class="padding10 first-collumn" style="width: 20%;">
                     {% set values = dict() %}
-                    {% set values = {'0.11.0':'0.11.0', '1.0.0':'1.0.0', '1.1.0':'1.1.0', '1.2.0':'1.2.0', '1.3.0':'1.3.0'} %}
-                    {{ select('nginxexpver',  values=values, selected='1.3.0') }}
+                    {% set values = {'1.0.0':'1.0.0', '1.1.0':'1.1.0', '1.2.0':'1.2.0', '1.3.0':'1.3.0', '1.4.0':'1.4.0'} %}
+                    {{ select('nginxexpver',  values=values, selected='1.4.0') }}
                 </td>
                 <td class="padding10 first-collumn">
                     <select autofocus required name="nginx_exp_addserv" id="nginx_exp_addserv">