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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Tremer
2021-05-25 09:46:50 +00:00
parent 5987732fd4 2b51f53cfd
commit bf1ea6966b
6 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config/rootfiles/common/ppp
View File

@@ -38,18 +38,18 @@ etc/ppp/standardloginscript
#usr/include/pppd/upap.h
usr/lib/pppd
usr/lib/pppd/2.4.9
#usr/lib/pppd/2.4.9/minconn.so
#usr/lib/pppd/2.4.9/openl2tp.so
#usr/lib/pppd/2.4.9/passprompt.so
#usr/lib/pppd/2.4.9/passwordfd.so
#usr/lib/pppd/2.4.9/pppoatm.so
#usr/lib/pppd/2.4.9/pppoe.so
#usr/lib/pppd/2.4.9/pppol2tp.so
#usr/lib/pppd/2.4.9/radattr.so
#usr/lib/pppd/2.4.9/radius.so
#usr/lib/pppd/2.4.9/radrealms.so
#usr/lib/pppd/2.4.9/rp-pppoe.so
#usr/lib/pppd/2.4.9/winbind.so
usr/lib/pppd/2.4.9/minconn.so
usr/lib/pppd/2.4.9/openl2tp.so
usr/lib/pppd/2.4.9/passprompt.so
usr/lib/pppd/2.4.9/passwordfd.so
usr/lib/pppd/2.4.9/pppoatm.so
usr/lib/pppd/2.4.9/pppoe.so
usr/lib/pppd/2.4.9/pppol2tp.so
usr/lib/pppd/2.4.9/radattr.so
usr/lib/pppd/2.4.9/radius.so
usr/lib/pppd/2.4.9/radrealms.so
usr/lib/pppd/2.4.9/rp-pppoe.so
usr/lib/pppd/2.4.9/winbind.so
usr/sbin/chat
usr/sbin/pppd
usr/sbin/pppdump

1
config/rootfiles/core/158/filelists/backup Symbolic link
View File

@@ -0,0 +1 @@
../../../common/backup

7
config/rootfiles/oldcore/157/update.sh
View File

@@ -97,6 +97,9 @@ extract_files
# update linker config
ldconfig
# Apply local configuration to sshd_config
/usr/local/bin/sshctrl
# Update Language cache
/usr/local/bin/update-lang-cache
@@ -121,6 +124,10 @@ rm -f \
/usr/lib/dma-mbox-create \
/usr/lib/openssh/ssh-keysign
# Delete orphaned pppd 2.4.8 shared object files
rm -rf \
/usr/lib/pppd/2.4.8/
# Start services
/etc/init.d/sshd restart
/etc/init.d/apache restart

2
config/rootfiles/packages/icinga
View File

@@ -25,7 +25,7 @@ usr/bin/icinga
usr/bin/icingastats
#usr/lib/icinga
usr/lib/icinga/p1.pl
usr/lib/nagios/plugins/eventhandlers
#usr/lib/nagios/plugins/eventhandlers
#usr/lib/nagios/plugins/eventhandlers/disable_active_service_checks
#usr/lib/nagios/plugins/eventhandlers/disable_notifications
#usr/lib/nagios/plugins/eventhandlers/distributed-monitoring

2
lfs/icinga
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = icinga
PAK_VER = 4
PAK_VER = 5
DEPS = nagios-plugins

9
lfs/nagios-plugins
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nagios-plugins
PAK_VER = 5
PAK_VER = 6
DEPS =
@@ -92,4 +92,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Prevent Nagios plugins from being owned (and hence writeable) by "nobody"
chown root:root -R /usr/lib/nagios/plugins
# Unfortunately, some of these plugins need the SUID bit to do their work properly
chmod +s \
/usr/lib/nagios/plugins/check_dhcp \
/usr/lib/nagios/plugins/check_icmp \
/usr/lib/nagios/plugins/check_ide_smart \
/usr/lib/nagios/plugins/check_ping
@$(POSTBUILD)