From 6958ceba6fb19a9c263bbc54cd21def8218f044d Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Wed, 12 Dec 2018 21:59:08 +0100
Subject: [PATCH] Add backup option

---
 .../luasrc/controller/openmptcprouter.lua         |  9 ++++++---
 .../luasrc/view/openmptcprouter/wizard.htm        | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 4eac62b65..be6010752 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -222,6 +222,7 @@ function wizard_add()
 	local servers = luci.http.formvaluetable("server")
 	for server, _ in pairs(servers) do
 		local server_ip = luci.http.formvalue("%s.server_ip" % server) or ""
+		local backup = luci.http.formvalue("%s.backup" % server) or "0"
 
 		-- OpenMPTCProuter VPS
 		local openmptcprouter_vps_key = luci.http.formvalue("%s.openmptcprouter_vps_key" % server) or ""
@@ -230,6 +231,7 @@ function wizard_add()
 		ucic:set("openmptcprouter",server,"password",openmptcprouter_vps_key)
 		ucic:set("openmptcprouter",server,"get_config","1")
 		ucic:set("openmptcprouter",server,"ip",server_ip)
+		ucic:set("openmptcprouter",server,"backup",backup)
 		ucic:save("openmptcprouter")
 		if server_ip ~= "" then
 			serversnb = serversnb + 1
@@ -244,20 +246,21 @@ function wizard_add()
 
 	for server, _ in pairs(servers) do
 		local server_ip = luci.http.formvalue("%s.server_ip" % server) or ""
+		local backup = luci.http.formvalue("%s.backup" % server) or "0"
 		-- We have an IP, so set it everywhere
 		if server_ip ~= "" then
 			-- Check if we have more than one IP, in this case use Nginx HA
 			if serversnb > 1 then
-				if k == 0 then
+				if backup == "0" then
 					ss_ip=server_ip
 					table.insert(ss_servers_nginx,server_ip .. ":65101 max_fails=3 fail_timeout=30s")
-					table.insert(ss_servers_ha,server_ip .. ":65101 weight 1 check")
+					table.insert(ss_servers_ha,server_ip .. ":65101 check")
 					if vpn_port ~= "" then
 						table.insert(vpn_servers,server_ip .. ":" .. vpn_port .. " max_fails=3 fail_timeout=30s")
 					end
 				else
 					table.insert(ss_servers_nginx,server_ip .. ":65101 backup")
-					table.insert(ss_servers_ha,server_ip .. ":65101 weight 2 check")
+					table.insert(ss_servers_ha,server_ip .. ":65101 backup")
 					if vpn_port ~= "" then
 						table.insert(vpn_servers,server_ip .. ":" .. vpn_port .. " backup")
 					end
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index a61db88c4..84da87033 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -50,6 +50,10 @@ end
 	<fieldset class="cbi-section" id="server">
 	    <legend><%:Server settings%></legend>
 	    <%
+		nbserver=0
+		uci:foreach("openmptcprouter","server", function(s)
+			nbserver=nbserver+1
+		end)
 		uci:foreach("openmptcprouter","server", function(s)
 		    servername = s[".name"]
 	    %>
@@ -79,7 +83,18 @@ end
 			</div>
 		    </div>
 		</div>
+		<% 
+		    if nbserver > 1 then
+		%>
+		<br />
+		<div class="cbi-value">
+		    <label class="cbi-value-title"><%:Set server as backup%></label>
+		    <div class="cbi-value-field">
+			<input class="cbi-input-checkbox" type="checkbox" name="<%=servername%>.backup" value="1" <% if uci:get("openmptcprouter",servername,"backup") == "1" then %>checked<% end %>/>
+		    </div>
+		</div>
 	    <%
+		    end
 		end)
 	    %>
 		<div class="cbi-section-create">