From 067bbaf136f15ddac7c2a9156cc8aa0a31ae209b Mon Sep 17 00:00:00 2001
From: Vincent Li <vincent.mc.li@gmail.com>
Date: Sun, 7 Jul 2024 19:49:07 +0000
Subject: [PATCH] LoxiLB: rename UI ipconfig to ipconfigfile

when run loxicmd save -a -c /var/ipfire/loxilb/
ipconfig directory will be created, which conflicts
with loxilb UI that also save virtual ip to
/var/ipfire/loxilb/ipconfig, so rename ipconfig to
ipconfigfile.

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
---
 html/cgi-bin/dhcp.cgi       | 2 +-
 html/cgi-bin/keepalived.cgi | 2 +-
 html/cgi-bin/loxilb.cgi     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 96e434716..742e3c5fa 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -42,7 +42,7 @@ our $filename1 = "${General::swroot}/dhcp/advoptions"; 	# Field separator is TAB
 									# because we need commas in the some data
 our $filename2 = "${General::swroot}/dhcp/fixleases";
 our $filename3 = "${General::swroot}/dhcp/advoptions-list";	# Describe the allowed syntax for dhcp options
-my $loxilbipfile = "${General::swroot}/loxilb/ipconfig";
+my $loxilbipfile = "${General::swroot}/loxilb/ipconfigfile";
 my $errormessage = '';
 my $warnNTPmessage = '';
 my @nosaved=();
diff --git a/html/cgi-bin/keepalived.cgi b/html/cgi-bin/keepalived.cgi
index 82fcaaec4..ea69e5e3a 100644
--- a/html/cgi-bin/keepalived.cgi
+++ b/html/cgi-bin/keepalived.cgi
@@ -40,7 +40,7 @@ my %mainsettings=();
 my %timesettings=();
 my $setting = "${General::swroot}/keepalived/settings";
 my $runsetting = "${General::swroot}/keepalived/runsettings";
-my $loxilbipfile = "${General::swroot}/loxilb/ipconfig";
+my $loxilbipfile = "${General::swroot}/loxilb/ipconfigfile";
 									# because we need commas in the some data
 my $errormessage = '';
 #remove 'ENABLE_HA' from '/var/ipfire/keepalived/settings' as it could affect keepalived running state
diff --git a/html/cgi-bin/loxilb.cgi b/html/cgi-bin/loxilb.cgi
index edd338040..01723ab30 100644
--- a/html/cgi-bin/loxilb.cgi
+++ b/html/cgi-bin/loxilb.cgi
@@ -44,7 +44,7 @@ my %checked=();
 my $errormessage='';
 my $setting = "${General::swroot}/main/settings";
 my $loxilbsettingfile = "${General::swroot}/loxilb/settings";
-my $loxilbipfile = "${General::swroot}/loxilb/ipconfig";
+my $loxilbipfile = "${General::swroot}/loxilb/ipconfigfile";
 
 # Read configuration file.