webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into perl_5.12.2

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-01-27 08:48:56 +01:00
parent d3b702945e f89463d829
commit c644577647
31 changed files with 278 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/45/exclude
View File

@@ -0,0 +1 @@
etc/snort/snort.conf

8
config/rootfiles/core/45/filelists/files
View File

@@ -1,11 +1,19 @@
etc/system-release
etc/issue
etc/httpd/conf/ssl-global.conf
etc/rc.d/init.d/functions
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/fireinfo.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/media.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/sbin/updxlrator
var/ipfire/outgoing/bin/outgoingfw.pl
srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
usr/local/bin/makegraphs
usr/local/bin/hddshutdown
usr/local/bin/vpn-watch

1
config/rootfiles/core/45/filelists/snort Symbolic link
View File

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

1
config/rootfiles/core/45/filelists/squid Symbolic link
View File

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

33
config/rootfiles/core/45/update.sh
View File

@@ -24,6 +24,9 @@
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
# Remove core updates from pakfire cache to save space...
rm -f /var/cache/pakfire/core-upgrade-*.ipfire
#
#Stop services
echo Stopping Proxy
@@ -35,23 +38,43 @@ killall vpn-watch
#Extract files
extract_files
#
# Remove some addon cronjobs if the addons are not installed
[ ! -e /opt/pakfire/db/installed/meta-cacti ] && rm -f /etc/fcron.cyclic/cacti.cron
[ ! -e /opt/pakfire/db/installed/meta-gnump3d ] && rm -f /etc/fcron.daily/gnump3d-index
[ ! -e /opt/pakfire/db/installed/meta-asterisk ] && rm -f /etc/fcron.minutely/wakeup.sh
# Remove disable cron mails...
sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp
fcrontab /var/tmp/root.tmp
#
#Start services
echo Starting Proxy
/etc/init.d/squid start 2>/dev/null
echo Rewriting Outgoing FW Rules
/var/ipfire/outgoing/bin/outgoingfw.pl
echo Starting vpn-watch
/usr/local/bin/vpn-watch &
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
echo Starting vpn-watch
/usr/local/bin/vpn-watch &
fi
#
#Update Language cache
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Disable geode_aes modul
mv /lib/modules/2.6.32.28-ipfire/kernel/drivers/crypto/geode-aes.ko \
/lib/modules/2.6.32.28-ipfire/kernel/drivers/crypto/geode-aes.ko.off >/dev/null 2>&1
mv /lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/crypto/geode-aes.ko \
/lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/crypto/geode-aes.ko.off >/dev/null 2>&1
mv /lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/crypto/geode-aes.ko \
/lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/crypto/geode-aes.ko.off >/dev/null 2>&1
#Rebuild module dep's
#depmod 2.6.32.28-ipfire
#depmod 2.6.32.28-ipfire-pae
#depmod 2.6.32.28-ipfire-xen
depmod 2.6.32.28-ipfire >/dev/null 2>&1
depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
#
#Finish