mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
fixed wrong url on redirector page
reverted clamav because of gcc problem fixed outgoingfw error with ppp connections added recent fixes to core 2 fixed ppp script timeout no more killing up and down scripts remove empty lines from the package files because of stty error git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1127 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
@@ -46,8 +46,6 @@ my $DEBUG = 0;
|
||||
my $configfile = "/var/ipfire/outgoing/rules";
|
||||
my $p2pfile = "/var/ipfire/outgoing/p2protocols";
|
||||
|
||||
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
|
||||
|
||||
### Values that have to be initialized
|
||||
$outfwsettings{'ACTION'} = '';
|
||||
$outfwsettings{'VALID'} = 'yes';
|
||||
@@ -79,6 +77,8 @@ my $DO = "";
|
||||
&General::readhash("${General::swroot}/outgoing/settings", \%outfwsettings);
|
||||
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
|
||||
|
||||
$netsettings{'RED_DEV'}=`cat /var/ipfire/red/iface`;
|
||||
|
||||
open( FILE, "< $configfile" ) or die "Unable to read $configfile";
|
||||
@configs = <FILE>;
|
||||
close FILE;
|
||||
|
||||
@@ -2,5 +2,8 @@ srv/web/ipfire/cgi-bin/qos.cgi
|
||||
srv/web/ipfire/cgi-bin/pakfire.cgi
|
||||
srv/web/ipfire/cgi-bin/ids.cgi
|
||||
srv/web/ipfire/cgi-bin/index.cgi
|
||||
srv/web/ipfire/html/redirect.cgi
|
||||
var/ipfire/qos/bin/makeqosscripts.pl
|
||||
var/ipfire/outgoing/bin/outgoingfw.pl
|
||||
etc/sysconfig/rc.local
|
||||
etc/ppp/options
|
||||
|
||||
@@ -2,3 +2,9 @@
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
mv /etc/sysconfig/rc.local /etc/sysconfig/rc.local.old
|
||||
extract_files
|
||||
if [ -e "/var/ipfire/qos/enable" ]; then
|
||||
/usr/local/bin/qosctrl stop
|
||||
/usr/local/bin/qosctrl generate
|
||||
/usr/local/bin/qosctrl start
|
||||
fi
|
||||
/usr/local/bin/outgoingfwctrl
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
* cpio-2.6
|
||||
* cups-1.2.12
|
||||
* cups-1.3.4
|
||||
* cups-1.3.5
|
||||
* curl-7.15.3
|
||||
* cyrus-imapd-2.2.12
|
||||
* cyrus-sasl-2.1.21
|
||||
|
||||
@@ -114,7 +114,7 @@ print <<END
|
||||
<td colspan='3' height='60%' valign="bottom" align="right">
|
||||
<font face="verdana,arial,sans serif" color="#656565" size="1">Web Filtering by
|
||||
</font>
|
||||
<a href="http://www.ipfire.eu" target="_blank"><b>
|
||||
<a href="http://www.ipfire.org" target="_blank"><b>
|
||||
<font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a>
|
||||
</font>
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 0.92
|
||||
VER = 0.91.2
|
||||
|
||||
THISAPP = clamav-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = clamav
|
||||
PAK_VER = 2
|
||||
PAK_VER = 1
|
||||
|
||||
DEPS = ""
|
||||
|
||||
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = e500651858a9187a87025c8a5c23969c
|
||||
$(DL_FILE)_MD5 = 2a7265d17cfa80c32858978f16a3f47b
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
@@ -22,9 +22,7 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
touch /etc/asound.state
|
||||
ln -svf ../init.d/alsa /etc/rc.d/rc3.d/S65alsa
|
||||
ln -svf ../init.d/alsa /etc/rc.d/rc0.d/K35alsa
|
||||
|
||||
@@ -22,7 +22,5 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
remove_files
|
||||
|
||||
rm -rf /etc/rc.d/rc*.d/*alsa
|
||||
|
||||
@@ -22,13 +22,9 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
sleep 60 && /etc/init.d/applejuice start &
|
||||
|
||||
ln -svf ../init.d/applejuice /etc/rc.d/rc0.d/K05applejuice
|
||||
ln -svf ../init.d/applejuice /etc/rc.d/rc3.d/S98applejuice
|
||||
ln -svf ../init.d/applejuice /etc/rc.d/rc6.d/K05applejuice
|
||||
|
||||
/etc/init.d/apache reload
|
||||
/etc/init.d/apache reload
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
/etc/init.d/applejuice stop
|
||||
|
||||
remove_files
|
||||
|
||||
rm -rf /etc/rc.d/rc*.d/*applejuice
|
||||
|
||||
@@ -22,7 +22,5 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
/usr/local/bin/clamavctrl enable
|
||||
|
||||
@@ -22,7 +22,5 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
remove_files
|
||||
|
||||
/usr/local/bin/clamavctrl disable
|
||||
|
||||
@@ -22,11 +22,8 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
start_service --delay 300 --background ${NAME}
|
||||
|
||||
ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups
|
||||
ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups
|
||||
ln -svf ../init.d/cups /etc/rc.d/rc6.d/K00cups
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
stop_service ${NAME}
|
||||
|
||||
remove_files
|
||||
|
||||
rm -rf /etc/rc.d/rc*.d/*cups
|
||||
|
||||
@@ -22,12 +22,9 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
restore_backup ${NAME}
|
||||
|
||||
start_service ${NAME}
|
||||
|
||||
ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc0.d/K23cyrus-imapd
|
||||
ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc3.d/S37cyrus-imapd
|
||||
ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc6.d/K23cyrus-imapd
|
||||
|
||||
@@ -22,11 +22,7 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
stop_service ${NAME}
|
||||
|
||||
make_backup ${NAME}
|
||||
|
||||
remove_files
|
||||
|
||||
rm -rfv /etc/rc.d/rc*.d/*cyrus-imapd
|
||||
|
||||
@@ -22,11 +22,8 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl
|
||||
ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl
|
||||
|
||||
start_service ${NAME}
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
stop_service ${NAME}
|
||||
|
||||
remove_files
|
||||
|
||||
rm -rvf /etc/rc.d/rc*.d/*cyrus-sasl
|
||||
|
||||
@@ -22,8 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
restore_backup ${NAME}
|
||||
|
||||
start_service --background ${NAME}
|
||||
|
||||
@@ -22,8 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
stop_service ${NAME}
|
||||
make_backup ${NAME}
|
||||
|
||||
remove_files
|
||||
|
||||
@@ -22,11 +22,8 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
start_service ${NAME}
|
||||
|
||||
ln -svf ../init.d/gnump3d /etc/rc.d/rc0.d/K00gnump3d
|
||||
ln -svf ../init.d/gnump3d /etc/rc.d/rc3.d/S99gnump3d
|
||||
ln -svf ../init.d/gnump3d /etc/rc.d/rc6.d/K00gnump3d
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
stop_service ${NAME}
|
||||
|
||||
remove_files
|
||||
|
||||
rm -rf /etc/rc.d/rc*.d/*gnump3d
|
||||
|
||||
@@ -22,7 +22,5 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
start_service --delay 90 --background ${NAME}
|
||||
|
||||
@@ -22,7 +22,5 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
stop_service ${NAME}
|
||||
|
||||
remove_files
|
||||
|
||||
@@ -22,7 +22,5 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
/etc/init.d/ipfireseeder stop
|
||||
|
||||
./install.sh
|
||||
|
||||
@@ -22,11 +22,8 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
start_service ${NAME}
|
||||
|
||||
ln -svf ../init.d/mldonkey /etc/rc.d/rc0.d/K05mldonkey
|
||||
ln -svf ../init.d/mldonkey /etc/rc.d/rc3.d/S98mldonkey
|
||||
ln -svf ../init.d/mldonkey /etc/rc.d/rc6.d/K05mldonkey
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
/etc/init.d/mldonkey stop
|
||||
|
||||
remove_files
|
||||
|
||||
rm -rf /etc/rc.d/rc*.d/*mldonkey
|
||||
|
||||
@@ -22,17 +22,12 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
ln -svf /etc/init.d/mpd /etc/rc.d/rc3.d/S65mpd
|
||||
ln -svf /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd
|
||||
ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd
|
||||
ln -svf /var/ipfire/mpfire/mpd.conf /etc/mpd.conf
|
||||
|
||||
touch /var/log/mpd.error.log
|
||||
touch /var/log/mpd.log
|
||||
|
||||
restore_backup ${NAME}
|
||||
|
||||
start_service --delay 60 --background ${NAME}
|
||||
|
||||
@@ -22,10 +22,7 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
stop_service ${NAME}
|
||||
make_backup ${NAME}
|
||||
|
||||
remove_files
|
||||
|
||||
rm -f /etc/rc.d/rc*.d/*mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf
|
||||
|
||||
@@ -22,25 +22,18 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
ln -svf ../init.d/mysql /etc/rc.d/rc0.d/K26mysql
|
||||
ln -svf ../init.d/mysql /etc/rc.d/rc3.d/S34mysql
|
||||
ln -svf ../init.d/mysql /etc/rc.d/rc6.d/K26mysql
|
||||
|
||||
/etc/init.d/mysql start
|
||||
|
||||
COUNTER=0
|
||||
|
||||
while [ "$COUNTER" -lt "10" ]; do
|
||||
[ -e "/var/run/mysql/mysql.sock" ] && break
|
||||
echo "MySQL server is still not running. Waiting 5 seconds."
|
||||
sleep 5
|
||||
COUNTER=$(($COUNTER + 1))
|
||||
done
|
||||
|
||||
[ -e "/var/run/mysql/mysql.sock" ] || (echo "MySQL still noch running... Exiting."; \
|
||||
exit 1)
|
||||
|
||||
mysqladmin -u root --password='' password 'mysqlfire'
|
||||
|
||||
@@ -22,7 +22,5 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
remove_files
|
||||
|
||||
rm -rvf /etc/rc.d/rc*.d/*mysql
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
mysql < /srv/web/openmailadmin/mail.dump
|
||||
|
||||
/etc/init.d/apache reload
|
||||
|
||||
@@ -22,5 +22,4 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
remove_files
|
||||
|
||||
@@ -22,16 +22,11 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
|
||||
postalias /etc/aliases
|
||||
|
||||
# Set postfix's hostname
|
||||
postconf -e "myhostname=$(hostname -f)"
|
||||
|
||||
/etc/init.d/postfix start
|
||||
|
||||
ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix
|
||||
ln -sf ../init.d/postfix /etc/rc.d/rc3.d/S35postfix
|
||||
ln -sf ../init.d/postfix /etc/rc.d/rc6.d/K25postfix
|
||||
|
||||
@@ -22,7 +22,5 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
remove_files
|
||||
|
||||
rm -rfv /etc/rc.d/rc*.d/*postfix
|
||||
|
||||
@@ -22,8 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
extract_files
|
||||
restore_backup ${NAME}
|
||||
|
||||
/usr/local/bin/sambactrl smbstart
|
||||
|
||||
@@ -22,8 +22,6 @@
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
|
||||
/usr/local/bin/sambactrl smbstop
|
||||
make_backup ${NAME}
|
||||
|
||||
remove_files
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
linkname ipfire
|
||||
noauth
|
||||
child-timeout 0
|
||||
|
||||
Reference in New Issue
Block a user