webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

haproxy: move haproxy to core package

Browse Source 
move haproxy to core package

prepare /var/ipfire/haproxy for haproxy UI, use
/var/ipfire/haproxy/haproxy.cfg

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
This commit is contained in:
Vincent Li
2024-10-27 01:21:55 +00:00
parent a600787c67
commit 0a726a99ac
6 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/cfgroot/haproxy-settings Normal file
View File

@@ -0,0 +1 @@
ENABLE_HAPROXY=off

8
config/rootfiles/common/haproxy Normal file
View File

@@ -0,0 +1,8 @@
etc/haproxy/haproxy.cfg
etc/logrotate.d/haproxy
etc/rc.d/init.d/haproxy
etc/rc.d/rc3.d/S35haproxy
usr/sbin/haproxy
var/ipfire/backup/addons/includes/haproxy
var/lib/haproxy
var/ipfire/haproxy

5
lfs/configroot
View File

@@ -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 keepalived xdpdns xdpsni sensors suricata time \
proxy/calamaris/bin qos/bin red remote ddos loxilb keepalived haproxy xdpdns xdpsni 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 xdpdns/settings xdpdns/domainfile xdpsni/settings xdpsni/domainfile keepalived/keepalived.conf keepalived/runsettings keepalived/settings keepalived/configvs keepalived/configrs 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 xdpdns/settings xdpdns/domainfile xdpsni/settings xdpsni/domainfile keepalived/keepalived.conf keepalived/runsettings keepalived/settings keepalived/configvs keepalived/configrs haproxy/settings 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; \
@@ -107,6 +107,7 @@ $(TARGET) :
cp $(DIR_SRC)/config/cfgroot/loxilb-FWconfig.txt $(CONFIG_ROOT)/loxilb/FWconfig.txt
cp $(DIR_SRC)/config/cfgroot/xdpdns-settings $(CONFIG_ROOT)/xdpdns/settings
cp $(DIR_SRC)/config/cfgroot/xdpsni-settings $(CONFIG_ROOT)/xdpsni/settings
cp $(DIR_SRC)/config/cfgroot/haproxy-settings $(CONFIG_ROOT)/haproxy/settings
cp $(DIR_SRC)/config/cfgroot/time-settings $(CONFIG_ROOT)/time/settings
cp $(DIR_SRC)/config/cfgroot/logging-settings $(CONFIG_ROOT)/logging/settings
cp $(DIR_SRC)/config/cfgroot/ethernet-vlans $(CONFIG_ROOT)/ethernet/vlans

2
lfs/haproxy
View File

@@ -96,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-mkdir -pv /etc/haproxy /var/lib/haproxy
install -v -m 644 $(DIR_SRC)/config/haproxy/haproxy.cfg \
/etc/haproxy/haproxy.cfg
/var/ipfire/haproxy/haproxy.cfg
install -v -m 644 $(DIR_SRC)/config/backup/includes/haproxy \
/var/ipfire/backup/addons/includes/haproxy

1
lfs/initscripts
View File

@@ -129,6 +129,7 @@ $(TARGET) :
ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl
ln -sf ../init.d/sshd /etc/rc.d/rc3.d/S30sshd
ln -sf ../init.d/apache /etc/rc.d/rc3.d/S32apache
ln -sf ../init.d/haproxy /etc/rc.d/rc3.d/S35haproxy
ln -sf ../init.d/fcron /etc/rc.d/rc3.d/S40fcron
ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local
ln -sf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh

11
src/initscripts/packages/haproxy
View File

@@ -21,12 +21,15 @@
. /etc/sysconfig/rc
. ${rc_functions}
eval $(/usr/local/bin/readhash /var/ipfire/haproxy/settings)
case "${1}" in
start)
boot_mesg "Starting HAProxy..."
loadproc /usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg \
-p /var/run/haproxy.pid
if [ "$ENABLE_HAPROXY" == "on" ]; then
boot_mesg "Starting HAProxy..."
loadproc /usr/sbin/haproxy -D -f /var/ipfire/haproxy/haproxy.cfg \
-p /var/run/haproxy.pid
fi
;;
stop)
@@ -36,7 +39,7 @@ case "${1}" in
reload)
boot_mesg "Reloading HAProxy..."
/usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg \
/usr/sbin/haproxy -D -f /var/ipfire/haproxy/haproxy.cfg \
-p /var/run/haproxy.pid -sf $(cat /var/run/haproxy.pid)
evaluate_retval
;;