webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://stevee@git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Stefan Schantl
2009-03-24 22:41:22 +01:00
parent 490ecce576 e2e23c306b
commit bbffc9c2e6
5 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/grub/grub.conf
View File

@@ -14,6 +14,11 @@ title IPFire (vesafb 640x480)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
initrd /ipfirerd-KVER.img
savedefault 1
title IPFire (vesafb 800x600)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=788 MOUNT
initrd /ipfirerd-KVER.img
savedefault 1
title IPFire (vesafb 1024x768)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT

4
config/httpd/vhosts.d/nagios.conf
View File

@@ -1,6 +1,6 @@
Listen 1007
Listen 1008
<VirtualHost *:1007>
<VirtualHost *:1008>
# SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER
# Last Modified: 11-26-2005

27
config/rootfiles/core/28/update.sh
View File

@@ -17,13 +17,16 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2008 IPFire-Team <info@ipfire.org>. #
# Copyright (C) 2009 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
NEWVERSION="2.3"
#
KVER="2.6.27.20"
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
@@ -42,12 +45,14 @@ echo update archive. This may take a while ...
# Add some files that are not in the package to backup
echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
echo boot >> /opt/pakfire/tmp/ROOTFILES
echo etc/issue >> /opt/pakfire/tmp/ROOTFILES
echo opt/pakfire/etc/pakfire.conf >> /opt/pakfire/tmp/ROOTFILES
echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
#
tar czvf /var/ipfire/backup/coreupdate28_$KVER.tar.gz.tar.gz \
-T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
echo
echo Update IPfire Kernel to $KVER ...
echo Update IPfire to $NEWVERSION ...
# Remove old kernel, configs, initrd, modules ...
#
rm -rf /boot/System.map-*
@@ -103,9 +108,23 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
#
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#
# Delete old lm-sensor modullist...
#
rm -rf /etc/sysconfig/lm_sensors
#
# Restart snort
#
/etc/init.d/snort restart
#
# Change version of Pakfire.conf
#
sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
#
# Create new issue
#
echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
echo =================================== >> /etc/issue
echo \\n running on \\s \\r \\m >> /etc/issue
#
# This core-update need a reboot
/usr/bin/logger -p syslog.emerg -t core-upgrade-28 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
/usr/bin/logger -p syslog.emerg -t core-upgrade-28 "Upgrade finished. Please reboot... "

2
config/rootfiles/packages/nagios
View File

@@ -440,6 +440,8 @@ usr/share/nagios/stylesheets
#usr/share/nagios/stylesheets/summary.css
#usr/share/nagios/stylesheets/tac.css
#usr/share/nagios/stylesheets/trends.css
var/nagios
var/nagios/archives
var/nagios/rw
var/nagios/spool
var/nagios/spool/checkresults