From 59550878878e647f84d6c88eca474ded256851ef Mon Sep 17 00:00:00 2001 From: Vincent Li Date: Fri, 21 Jun 2024 00:54:17 +0000 Subject: [PATCH] keepalived: move keepalived to core package change keepalived default config to /var/ipfire/keepalived/keepalived.conf so keepalived WebUI could read/write the configuration file. also add /var/ipfire/keepalived directory Signed-off-by: Vincent Li keepalived: create /var/ipfire/keepalived --- config/rootfiles/{packages => common}/keepalived | 1 + lfs/configroot | 4 ++-- lfs/keepalived | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename config/rootfiles/{packages => common}/keepalived (98%) diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/common/keepalived similarity index 98% rename from config/rootfiles/packages/keepalived rename to config/rootfiles/common/keepalived index b0fbe7363..2fac3b0c2 100644 --- a/config/rootfiles/packages/keepalived +++ b/config/rootfiles/common/keepalived @@ -38,3 +38,4 @@ usr/sbin/keepalived #usr/share/man/man5/keepalived.conf.5 #usr/share/man/man8/keepalived.8 var/ipfire/backup/addons/includes/keepalived +var/ipfire/keepalived diff --git a/lfs/configroot b/lfs/configroot index 121cbaf66..a7197580f 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -54,7 +54,7 @@ $(TARGET) : ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist key langs logging mac main \ menu.d modem optionsfw \ ovpn patches pakfire portfw ppp private proxy/advanced/cre \ - proxy/calamaris/bin qos/bin red remote ddos loxilb sensors suricata time \ + proxy/calamaris/bin qos/bin red remote ddos loxilb keepalived sensors suricata time \ updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin vpn \ wakeonlan wireless ; do \ mkdir -p $(CONFIG_ROOT)/$$i; \ @@ -68,7 +68,7 @@ $(TARGET) : fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \ ipblocklist/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ - ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings ddos/settings ddos/tcp_ports ddos/udp-ddos-settings ddos/udp_ports ddos/dns-ddos-settings loxilb/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ + ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings ddos/settings ddos/tcp_ports ddos/udp-ddos-settings ddos/udp_ports ddos/dns-ddos-settings loxilb/settings keepalived/keepalived.conf qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ touch $(CONFIG_ROOT)/$$i; \ diff --git a/lfs/keepalived b/lfs/keepalived index fbb60a2ff..9b6ff2f80 100644 --- a/lfs/keepalived +++ b/lfs/keepalived @@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ - --with-kernel-dir=/usr + --with-kernel-dir=/usr --with-default-config-file=/var/ipfire/keepalived/keepalived.conf cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install