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

commit und geh weg

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@648 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-06-27 17:31:30 +00:00
parent 7d3af7f772
commit 69dcc42551
8 changed files with 366 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/updxlrator/updxlrator
View File

@@ -55,7 +55,7 @@ if (-e "$swroot/updatexlrator/settings")
if ($xlratorsettings{'ENABLE_LOG'} eq 'on') { $logging=1; };
if ($xlratorsettings{'PASSIVE_MODE'} eq 'on') { $passive_mode=1; };
$maxusage=$xlratorsettings{'MAX_DISK_USAGE'};
if ($xlratorsettings{'LOW_DOWNLOAD_PRIORITY'} eq 'on') { $nice='/usr/bin/nice --adjustment=15 '; };
if ($xlratorsettings{'LOW_DOWNLOAD_PRIORITY'} eq 'on') { $nice='/bin/nice --adjustment=15 '; };
}
if (!$maxusage) { $maxusage=75; };

1
doc/language_issues.de
View File

@@ -179,6 +179,7 @@ WARNING: translation string unused: iowait
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: iptable rules
WARNING: translation string unused: irq cpu usage
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version

1
doc/language_issues.en
View File

@@ -191,6 +191,7 @@ WARNING: translation string unused: iowait
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: iptable rules
WARNING: translation string unused: irq cpu usage
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version

1
langs/de/cgi-bin/de.pl
View File

@@ -880,6 +880,7 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'IPTables',
'irq cpu usage' => 'IRQ Cpu Nutzung ',
'isdn' => 'ISDN',
'isdn settings' => 'Zusätzliche ISDN-Einstellungen:',
'isdn1' => 'Einfaches ISDN',

1
langs/en/cgi-bin/en.pl
View File

@@ -892,6 +892,7 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'IPTables',
'irq cpu usage' => 'IRQ Cpu Usage ',
'isdn' => 'ISDN',
'isdn settings' => 'Additional ISDN settings:',
'isdn1' => 'Single ISDN',

2
src/initscripts/init.d/dhcp
View File

@@ -25,7 +25,7 @@ case "$1" in
boot_mesg "Starting DHCP Server..."
loadproc /usr/sbin/dhcpd -q ${devices}
chmod 644 /var/run/dhcpd.pid # Fix because silly dhcpd creates its pid with mode 640
sleep 20 && chmod 644 /var/run/dhcpd.pid # Fix because silly dhcpd creates its pid with mode 640
;;
stop)

4
src/initscripts/init.d/net/red/update
View File

@@ -37,8 +37,8 @@ IFACE=`cat /var/ipfire/red/iface 2>/dev/null | tr -d '\012'`
REMOTE=`cat /var/ipfire/red/remote-ipaddress 2>/dev/null | tr -d '\012'`
### DNS Settings
DNS1=`cat /var/ipfire/red/dns1 2>/dev/null | tr -d '\012'`
DNS2=`cat /var/ipfire/red/dns2 2>/dev/null | tr -d '\012'`
DNS1=`cat /var/ipfire/red/dns1 > /dev/null 2>&1 | tr -d '\012'`
DNS2=`cat /var/ipfire/red/dns2 > /dev/null 2>&1 | tr -d '\012'`
echo > /var/ipfire/red/resolv.conf #clear it
[ "$DNS1" != "" ] && echo "nameserver $DNS1" > /var/ipfire/red/resolv.conf
[ "$DNS2" != "" ] && echo "nameserver $DNS2" >> /var/ipfire/red/resolv.conf

21
src/misc-progs/ipsecctrl.c
View File

@@ -28,22 +28,6 @@
Unfortunatly, openswan 1 cannot do that correctly. It cannot use an
interface without restarting everything.
IPCop should control vpn this way:
rc.netaddrsesup.up
call ipsecctrl once to start vpns on all interface
RED based vpn won't start because "auto=ignore" instead off "auto=start"
rc.updatered
call ipsectrl to turn on or off vpn based on RED
but now it is only:
rc.updatered
call ipsectrl S at every event on RED.
Consequence: BLUE vpn is not started until RED goes up.
*/
#define phystable "IPSECPHYSICAL"
@@ -298,11 +282,10 @@ int main(int argc, char *argv[]) {
if (strcmp(argv[1], "D") == 0) {
ipsec_norules();
/* Only shutdown pluto if it really is running */
int fd;
/* Get pluto pid */
if ((fd = open("/var/run/pluto.pid", O_RDONLY)) != -1) {
if (file = fopen("/var/run/pluto.pid", "r")) {
safe_system("/etc/rc.d/init.d/ipsec stop 2> /dev/null >/dev/null");
close(fd);
close(file);
}
exit(0);
}