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 remote-tracking branch 'origin/core66' into next

Browse Source
This commit is contained in:
Michael Tremer
2013-02-16 14:29:26 +01:00
parent fd88f2ee29 eb7fff99fc
commit ecf97bd212
8 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/66/filelists/files
View File

@@ -38,6 +38,7 @@ srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/bin/watch usr/bin/watch
usr/local/bin/backupiso
usr/local/bin/makegraphs usr/local/bin/makegraphs
usr/local/bin/readhash usr/local/bin/readhash
usr/local/bin/scanhd usr/local/bin/scanhd

10
html/cgi-bin/backup.cgi
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2005-2010 IPFire Team # # Copyright (C) 2005-2013 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -176,7 +176,13 @@ print <<END
<td align='left'> <td align='left'>
<input type='radio' name='BACKUPLOGS' value='include'/> $Lang::tr{'include logfiles'}<br/> <input type='radio' name='BACKUPLOGS' value='include'/> $Lang::tr{'include logfiles'}<br/>
<input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/> $Lang::tr{'exclude logfiles'}<br/> <input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/> $Lang::tr{'exclude logfiles'}<br/>
<input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'} END
;
my $MACHINE=`uname -m`;
if ( ! ( $MACHINE =~ "arm" )) {
print" <input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}<br/>"
}
print <<END
</td> </td>
</tr> </tr>
<tr><td align='center' colspan='2'> <tr><td align='center' colspan='2'>

0
html/cgi-bin/ovpnmain.cgi Executable file → Normal file
View File

10
html/cgi-bin/proxy.cgi
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -3556,15 +3556,15 @@ if ($delaypools) {
if ($proxysettings{'NO_PROXY_LOCAL'} eq 'on') if ($proxysettings{'NO_PROXY_LOCAL'} eq 'on')
{ {
print FILE "#Prevent internal proxy access to Green\n"; print FILE "#Prevent internal proxy access to Green except IPFire itself\n";
print FILE "http_access deny IPFire_green_servers !IPFire_green_network\n\n"; print FILE "http_access deny IPFire_green_servers !IPFire_ips !IPFire_green_network\n\n";
} }
if ($proxysettings{'NO_PROXY_LOCAL_BLUE'} eq 'on') if ($proxysettings{'NO_PROXY_LOCAL_BLUE'} eq 'on')
{ {
print FILE "#Prevent internal proxy access from Blue\n"; print FILE "#Prevent internal proxy access from Blue except IPFire itself\n";
print FILE "http_access allow IPFire_blue_network IPFire_blue_servers\n"; print FILE "http_access allow IPFire_blue_network IPFire_blue_servers\n";
print FILE "http_access deny IPFire_blue_network IPFire_servers\n\n"; print FILE "http_access deny IPFire_blue_network !IPFire_ips IPFire_servers\n\n";
} }
print FILE <<END print FILE <<END

6
make.sh
View File

@@ -24,9 +24,9 @@
NAME="IPFire" # Software name NAME="IPFire" # Software name
SNAME="ipfire" # Short name SNAME="ipfire" # Short name
VERSION="2.13rc2" # Version number VERSION="2.13" # Version number
CORE="65" # Core Level (Filename) CORE="66" # Core Level (Filename)
PAKFIRE_CORE="65" # Core Level (PAKFIRE) PAKFIRE_CORE="66" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir CONFIG_ROOT=/var/ipfire # Configuration rootdir

8
src/install+setup/install/main.c
View File

@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
ctr[TR_CANCEL], NULL); ctr[TR_CANCEL], NULL);
} else { } else {
rc = 1; rc = 1;
fstype = EXT3; fstype = EXT4;
} }
if (rc == 2) if (rc == 2)
goto EXIT; goto EXIT;
@@ -596,12 +596,6 @@ EXIT:
fclose(flog); fclose(flog);
newtFinished(); newtFinished();
if (unattended) {
// Remove Setup autorun after boot
if (system("rm -f /harddisk/etc/rc.d/rcsysinit.d/S75firstsetup"))
printf("Unable to disable setup autorun.\n");
}
if (system("/bin/umount /harddisk/proc")) if (system("/bin/umount /harddisk/proc"))
printf("Unable to umount /harddisk/proc.\n"); printf("Unable to umount /harddisk/proc.\n");
} else { } else {

46
src/scripts/backupiso
View File

@@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
COREVER=`cat /opt/pakfire/db/core/mine` COREVER=$(cat /opt/pakfire/db/core/mine)
# FIXME: edit this lines before release # FIXME: edit this lines before release
URL=http://download.ipfire.org/releases/ipfire-2.x/2.11-core$COREVER/ URL="http://download.ipfire.org/releases/ipfire-2.x/2.13-core$COREVER/"
ISO=ipfire-2.11.i586-full-core$COREVER.iso ISO="ipfire-2.13.i586-full-core$COREVER.iso"
if [ -z "$1" ]; then if [ -z $1 ]; then
echo usage: $0 backup-file echo usage: $0 backup-file
exit exit
fi fi
@@ -15,22 +15,36 @@ TS=$1
mkdir -p /var/tmp/backupiso mkdir -p /var/tmp/backupiso
cd /var/tmp/backupiso cd /var/tmp/backupiso
echo "Fetching ${URL}${ISO}" if [ ! -e ${ISO} ]
wget --quiet -c ${URL}${ISO} then
echo "Fetching ${URL}md5sums.txt" echo "Fetching ${URL}${ISO}"
wget --quiet -c ${URL}${ISO}
fi
echo "Fetching ${URL}${ISO}.md5"
wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5 wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5
echo "Checking md5 of ${ISO}" echo "Checking md5 of ${ISO}"
md5sum --status -c ${ISO}.md5 md5sum --status -c ${ISO}.md5
RETVAR="$?" if [ $? -eq 0 -o $? -eq 24 ]
if [ $RETVAR -eq 0 -o $RETVAR -eq 24 ] then
then echo "md5 is OK"
echo "md5 is OK" else
else echo "md5 mismatch"
echo "md5 mismatch" echo "Fetching again ${URL}${ISO}"
echo "Fetching again ${URL}${ISO}" wget --quiet -O ${ISO} ${URL}${ISO}
wget --quiet -O ${ISO} ${URL}${ISO} echo "Checking again md5 of ${ISO}"
md5sum --status -c ${ISO}.md5
if [ $? -eq 0 -o $? -eq 24 ]
then
echo "md5 is OK"
else
echo "md5 mismatch"
echo "aborting backup because md5 mismatch"
exit 1
fi
fi fi
rm ${ISO}.md5
echo "Remastering iso" echo "Remastering iso"
mkdir -p backupiso.tmp.${TS} mkdir -p backupiso.tmp.${TS}
@@ -45,7 +59,7 @@ cp /var/ipfire/backup/${TS}.ipf backupiso.${TS}
echo "Running mkisofs" echo "Running mkisofs"
mkisofs -J -r -V "ipfire backup ${TS}" \ mkisofs -J -r -V "ipfire backup ${TS}" \
-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \ -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-c boot/isolinux/boot.catalog backupiso.${TS} > `basename ${ISO} .iso`-${TS}.iso -c boot/isolinux/boot.catalog backupiso.${TS} > $(basename ${ISO} .iso)-${TS}.iso
echo "Cleaning up" echo "Cleaning up"
rm -rf backupiso.${TS} rm -rf backupiso.${TS}

2
src/scripts/readhash
View File

@@ -13,7 +13,7 @@ VARNAME='[A-Za-z_][A-Za-z0-9_]*'
# For the assigned value we only accept a limited number of characters - none # For the assigned value we only accept a limited number of characters - none
# of which are shell metachars # of which are shell metachars
VARCHARS='A-Za-z0-9=/,.:_@#+-' VARCHARS='A-Za-z0-9=/,.:%_@#+-'
VARVAL="[${VARCHARS}]*" VARVAL="[${VARCHARS}]*"
sed -ne "s/\(${VARNAME}\)=\(${VARVAL}\)$/\1=\2/p" $1 sed -ne "s/\(${VARNAME}\)=\(${VARVAL}\)$/\1=\2/p" $1