From: ms
Date: Sun, 21 May 2006 20:54:29 +0000 (+0000)
Subject: Hinzugefügt:
X-Git-Tag: v2.3-beta1~1125
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=10a04d70a4c10ce105fe47fea763fc390c2036dd
Hinzugefügt:
* Nochmal ein neues Shutdown-Bild.
* Schnelle Profilauswahl in der index.cgi
* Nettraffic.
* Capiinfo.
Geändert:
* Menü komplett neu sortiert.
* Javascript-Option aus gui.cgi entfernt.
* Pakfire-Fehler beseitigt.
* Sämtliche /var/ipcop durch /var/ipfire ersetzt.
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@129 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
diff --git a/config/cdrom/README.txt b/config/cdrom/README.txt
index a6056eca50..9159321086 100644
--- a/config/cdrom/README.txt
+++ b/config/cdrom/README.txt
@@ -1,42 +1,42 @@
-IPCop - The Bad Packets Stop Here (VERSION)
-------------------------------------------
-
-Installation
-------------
-
-Please read the IPCop Installation PDF before installing the firewall.
-This document is located in the \doc directory on the cdrom. It will
-guide you through the installation process and will help you make the
-necessary decisions during the installation process.
-
-
-DOS Image utility tools
------------------------
-
-The dosutils directory contains the following DOS and Windows applications,
-please use with caution and please can we draw your attention to the
-documentation on the IPCop CD or install image on your network drive.
-We also draw your attention to the disclaimer of Warranty below.
-
-rawrite.exe - rawrite executable
-rawwritewin.exe - rawwrite for Windows
-diskio.dll - this MUST be in the same directory as rawrite for Windows
-copying.txt - text file
-
-
-License
--------
-
-Please read the file COPYING for more information on the license.
-
-
-Disclaimer of Warranty
-----------------------
-
-Users of this software must accept this disclaimer of warranty: "This
-software is supplied AS IS. IPCop disclaims all warranties, expressed
-or implied, including, without limitation, the warranties of merchantability
-and of fitness for any purpose. IPCop assumes no liability for
-damages, direct or consequential, which may result from the use of this
-software."
-
+IPFire - We secure your network (VERSION)
+------------------------------------------
+
+Installation
+------------
+
+Please read the IPFire Installation manual before installing the firewall.
+This document is located in the \doc directory on the cdrom. It will
+guide you through the installation process and will help you make the
+necessary decisions during the installation process.
+
+
+DOS Image utility tools
+-----------------------
+
+The dosutils directory contains the following DOS and Windows applications,
+please use with caution and please can we draw your attention to the
+documentation on the IPFire CD or install image on your network drive.
+We also draw your attention to the disclaimer of Warranty below.
+
+rawrite.exe - rawrite executable
+rawwritewin.exe - rawwrite for Windows
+diskio.dll - this MUST be in the same directory as rawrite for Windows
+copying.txt - text file
+
+
+License
+-------
+
+Please read the file COPYING for more information on the license.
+
+
+Disclaimer of Warranty
+----------------------
+
+Users of this software must accept this disclaimer of warranty: "This
+software is supplied AS IS. IPFire disclaims all warranties, expressed
+or implied, including, without limitation, the warranties of merchantability
+and of fitness for any purpose. IPFire assumes no liability for
+damages, direct or consequential, which may result from the use of this
+software."
+
diff --git a/config/cfgroot/backup-exclude b/config/cfgroot/backup-exclude
index e528590799..19f28284af 100644
--- a/config/cfgroot/backup-exclude
+++ b/config/cfgroot/backup-exclude
@@ -1,20 +1,21 @@
-var/ipcop/backup/*.system
-var/ipcop/backup/backup.key
-var/ipcop/backup/sets
-var/ipcop/countries.pl
-var/ipcop/dhcpc
-var/ipcop/eciadsl/modems.db
-var/ipcop/eciadsl/firmware00.bin
-var/ipcop/header.pl
-var/ipcop/general-functions.pl
-var/ipcop/lang.pl
-var/ipcop/key
-var/ipcop/langs
-var/ipcop/patches
-var/ipcop/ppp/fake-resolv.conf
-var/ipcop/red
-var/ipcop/time/counter
-var/ipcop/firewall/protocols.pl
-var/ipcop/firewall/defaultservices
-var/ipcop/firewall/icmptypes
-var/ipcop/addon-lang
+var/ipfire/backup/*.system
+var/ipfire/backup/backup.key
+var/ipfire/backup/sets
+var/ipfire/countries.pl
+var/ipfire/dhcpc
+var/ipfire/eciadsl/modems.db
+var/ipfire/eciadsl/firmware00.bin
+var/ipfire/header.pl
+var/ipfire/general-functions.pl
+var/ipfire/lang.pl
+var/ipfire/key
+var/ipfire/langs
+var/ipfire/patches
+var/ipfire/ppp/fake-resolv.conf
+var/ipfire/red
+var/ipfire/time/counter
+var/ipfire/firewall/protocols.pl
+var/ipfire/firewall/defaultservices
+var/ipfire/firewall/icmptypes
+var/ipfire/addon-lang
+var/ipfire/net-traffic
\ No newline at end of file
diff --git a/config/cfgroot/backup-exclude.hardware b/config/cfgroot/backup-exclude.hardware
index d6bcd153d8..5c0360af64 100644
--- a/config/cfgroot/backup-exclude.hardware
+++ b/config/cfgroot/backup-exclude.hardware
@@ -1 +1 @@
-var/ipcop/ethernet/settings
+var/ipfire/ethernet/settings
diff --git a/config/cfgroot/backup-include b/config/cfgroot/backup-include
index c8d66bd7c7..ab19ddcd7c 100644
--- a/config/cfgroot/backup-include
+++ b/config/cfgroot/backup-include
@@ -13,4 +13,4 @@
/etc/ssh/ssh_host_key.pub
/etc/ssh/ssh_host_rsa_key
/etc/ssh/ssh_host_rsa_key.pub
-/var/ipcop/
+/var/ipfire/
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 9c6ed7b265..f219de1557 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -9,8 +9,6 @@
# Copyright (c) 2002/08/23 Mark Wormgoor validfqdn()
# Copyright (c) 2003/09/11 Darren Critchley srtarray()
#
-# $Id: header.pl,v 1.34.2.39 2004/11/26 15:51:27 alanh Exp $
-#
package Header;
use CGI();
@@ -19,15 +17,6 @@ use Time::Local;
$|=1; # line buffering
-sub get_version() {
- my $read_ver = `cat /etc/ipfire-release`;
- if ($read_ver =~ /^$/) {
- return "IPFire (unknown version)";
- }
- return $read_ver;
-}
-
-$Header::version = get_version();
$Header::revision = 'final';
$Header::swroot = '/var/ipfire';
$Header::pagecolour = '#ffffff';
@@ -139,43 +128,37 @@ sub genmenu {
'title' => "$tr{'network configuration'}",
'enabled' => 1,
};
- $subsystem->{'03.updates'} = {
- 'caption' => $tr{'updates'},
- 'uri' => '/cgi-bin/updates.cgi',
- 'title' => "$tr{'updates'}",
- 'enabled' => 0,
- };
- $subsystem->{'04.passwords'} = {
+ $subsystem->{'03.passwords'} = {
'caption' => $tr{'sspasswords'},
'uri' => '/cgi-bin/changepw.cgi',
'title' => "$tr{'sspasswords'}",
'enabled' => 1,
};
- $subsystem->{'05.ssh'} = {
+ $subsystem->{'04.ssh'} = {
'caption' => $tr{'ssh access'},
'uri' => '/cgi-bin/remote.cgi',
'title' => "$tr{'ssh access'}",
'enabled' => 1,
};
- $subsystem->{'06.gui'} = {
+ $subsystem->{'05.gui'} = {
'caption' => $tr{'gui settings'},
'uri' => '/cgi-bin/gui.cgi',
'title' => "$tr{'gui settings'}",
'enabled' => 1,
};
- $subsystem->{'07.backup'} = {
+ $subsystem->{'06.backup'} = {
'caption' => $tr{'backup'},
'uri' => '/cgi-bin/backup.cgi',
'title' => "$tr{'backup'} / $tr{'restore'}",
'enabled' => 0,
};
- $subsystem->{'08.shutdown'} = {
+ $subsystem->{'07.shutdown'} = {
'caption' => $tr{'shutdown'},
'uri' => '/cgi-bin/shutdown.cgi',
'title' => "$tr{'shutdown'} / $tr{'reboot'}",
'enabled' => 1,
};
- $subsystem->{'09.credits'} = {
+ $subsystem->{'08.credits'} = {
'caption' => $tr{'credits'},
'uri' => '/cgi-bin/credits.cgi',
'title' => "$tr{'credits'}",
@@ -256,36 +239,61 @@ sub genmenu {
'title' => "$tr{'external aliases configuration'}",
'enabled' => 1,
};
+ $subnetwork->{'05.nettraf'} = {
+ 'caption' => '$tr{'sstraffic'}',
+ 'uri' => '/cgi-bin/traffic.cgi',
+ 'title' => "$tr{'sstraffic'}",
+ 'enabled' => 1,
+ };
+
+ $subnetwork->{'06.openvpn'} = {
+ 'caption' => 'OpenVPN',
+ 'uri' => '/cgi-bin/ovpnmain.cgi',
+ 'title' => "$tr{'virtual private networking'}",
+ 'enabled' => 1,
+ };
+ $subnetwork->{'07.ipsec'} = {
+ 'caption' => 'IPSec,
+ 'uri' => '/cgi-bin/vpnmain.cgi',
+ 'title' => "$tr{'virtual private networking'}",
+ 'enabled' => 1,
+ };
my %subserviceshash = ();
my $subservices = \%subserviceshash;
- $subservices->{'01.dhcp'} = {
+ $subservices->{'01.proxy'} = {
+ 'caption' => $tr{'proxy'},
+ 'uri' => '/cgi-bin/proxy.cgi',
+ 'title' => "HTTP: $tr{'web proxy configuration'}",
+ 'enabled' => 1,
+ };
+ $subservices->{'02.dhcp'} = {
'caption' => $tr{'dhcp server'},
'uri' => '/cgi-bin/dhcp.cgi',
'title' => "$tr{'dhcp configuration'}",
'enabled' => 1,
};
- $subservices->{'02.dyndns'} = {
+ $subservices->{'03.dyndns'} = {
'caption' => $tr{'dynamic dns'},
'uri' => '/cgi-bin/ddns.cgi',
'title' => "$tr{'dynamic dns client'}",
'enabled' => 1,
};
- $subservices->{'03.time'} = {
+ $subservices->{'04.time'} = {
'caption' => $tr{'time server'},
'uri' => '/cgi-bin/time.cgi',
'title' => "$tr{'time server'}",
'enabled' => 1,
};
- $subservices->{'04.shaping'} = {
- 'caption' => $tr{'traffic shaping'},
- 'uri' => '/cgi-bin/shaping.cgi',
+ $subservices->{'05.qos'} = {
+ 'caption' => 'Quality of Service',
+ 'uri' => '/cgi-bin/qos.cgi',
'title' => "$tr{'traffic shaping settings'}",
'enabled' => 1,
};
- $subservices->{'05.ids'} = {'caption' => $tr{'intrusion detection'},
+ $subservices->{'06.ids'} = {'caption' => $tr{'intrusion detection'},
'enabled' => 1,
'uri' => '/cgi-bin/ids.cgi',
'title' => "$tr{'intrusion detection system'} (Snort)",
@@ -322,87 +330,6 @@ sub genmenu {
};
-
- my %subhttphash = ();
- my $subhttp = \%subhttphash;
- $subhttp->{'01.proxy'} = {
- 'caption' => $tr{'proxy'},
- 'uri' => '/cgi-bin/advproxy.cgi',
- 'title' => "HTTP: $tr{'web proxy configuration'}",
- 'enabled' => 1,
- };
- $subhttp->{'02.contentfilter'} = {
- 'caption' => $tr{'content filter'},
- 'uri' => '/cgi-bin/dansguardian.cgi',
- 'title' => "HTTP: $tr{'content filter'}",
- 'enabled' => 1,
- };
- $subhttp->{'03.antivirus'} = {
- 'caption' => $tr{'antivirus'},
- 'uri' => '/cgi-bin/httpantivirus.cgi',
- 'title' => "HTTP: $tr{'antivirus'}",
- 'enabled' => 1,
- };
- $subhttp->{'04.proxymanagment'} = {
- 'caption' => $tr{'DS Managment'},
- 'uri' => '/cgi-bin/proxygm.cgi',
- 'title' => "HTTP: $tr{'DS Managment'}",
- 'enabled' => 1,
- };
- $subhttp->{'05.activatedgroups'} = {
- 'caption' => $tr{'activated Groups'},
- 'uri' => '/cgi-bin/proxyag.cgi',
- 'title' => "HTTP: $tr{'activated Groups'}",
- 'enabled' => 1,
- };
- $subhttp->{'06.advancedproxy'} = {
- 'caption' => $tr{'Proxy Advanced'},
- 'uri' => '/cgi-bin/proxyad.cgi',
- 'title' => "HTTP: $tr{'Proxy Advanced'}",
- 'enabled' => 1,
- };
-
-
- my %subproxyhash = ();
- my $subproxy = \%subproxyhash;
-
- $subproxy->{'01.http'} = {'caption' => $tr{'HTTP'},
- 'enabled' => 1,
- 'subMenu' => $subhttp
- };
- $subproxy->{'02.ftp'} = {'caption' => 'FTP',
- 'enabled' => 1,
- 'subMenu' => $subftp
- };
-
-
-
- my %subopenvpnhash = ();
- my $subopenvpn = \%subopenvpnhash;
- $subopenvpn->{'01.server'} = {'caption' => $tr{'openvpn'},
- 'uri' => '/cgi-bin/openvpn.cgi',
- 'title' => "$tr{'virtual private networking'}",
- 'enabled' => 1,
- };
- $subopenvpn->{'02.client'} = {'caption' => $tr{'openvpnclient'},
- 'uri' => '/cgi-bin/openvpnclient.cgi',
- 'title' => "$tr{'virtual private networking'}",
- 'enabled' => 1,
- };
-
- my %subvpnhash = ();
- my $subvpn = \%subvpnhash;
-
- $subvpn->{'01.openvpn'} = {'caption' => $tr{'openvpn'},
- 'subMenu' => $subopenvpn,
- 'enabled' => 1,
- };
- $subvpn->{'02.ipsec'} = {'caption' => $tr{'ipsec'},
- 'uri' => '/cgi-bin/vpnmain.cgi',
- 'title' => "$tr{'virtual private networking'}",
- 'enabled' => 1,
- };
-
my %sublogshash = ();
my $sublogs = \%sublogshash;
@@ -465,11 +392,21 @@ sub genmenu {
'title' => "$tr{'paketmanager'}",
'enabled' => 1,
};
+ $subipfire->{'02.asterisk'} = {'caption' => $tr{'asterisk'},
+ 'uri' => '/cgi-bin/asterisk.cgi',
+ 'title' => "$tr{'asterisk'}",
+ 'enabled' => 1,
+ };
$subipfire->{'02.samba'} = {'caption' => $tr{'samba'},
'uri' => '/cgi-bin/samba.cgi',
'title' => "$tr{'samba'}",
'enabled' => 1,
};
+ $subipfire->{'99.help'} = {'caption' => $tr{'help'},
+ 'uri' => '/cgi-bin/help.cgi',
+ 'title' => "$tr{'help'}",
+ 'enabled' => 1,
+ };
@@ -497,7 +434,7 @@ sub genmenu {
'enabled' => 1,
'subMenu' => $subproxy
};
- $menu->{'07.vpn'} = {'caption' => 'VPN',
+ $menu->{'07.ipfire'} = {'caption' => 'IPFire',
'enabled' => 1,
'subMenu' => $subvpn
};
@@ -505,12 +442,6 @@ sub genmenu {
'enabled' => 1,
'subMenu' => $sublogs
};
- $menu->{'09.ipfire'} = {'caption' => 'IPFire',
- 'enabled' => 1,
- 'subMenu' => $subipfire
- };
-
-
if (! blue_used() && ! orange_used()) {
$menu->{'05.firewall'}{'subMenu'}->{'03.dmz'}{'enabled'} = 0;
@@ -876,7 +807,6 @@ sub closepage () {
Status: $status Uptime:$uptime
- IPFire $version (c)