From bf7c473f7b0b0231854ed00e633322b25c5a247b Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 4 Apr 2007 12:55:38 +0000 Subject: [PATCH] Netzwerkscripts erweitert. Sprachsdateien aktualisiert, Menue fuer Firewallloggraphen hinzugefuegt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@480 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/etc/bashrc | 4 +- config/menu/00-menu.main | 14 +- config/menu/10-system.menu | 28 ++-- config/menu/20-status.menu | 54 +++---- config/menu/30-network.menu | 28 ++-- config/menu/40-services.menu | 16 +-- config/menu/50-firewall.menu | 24 ++-- config/menu/60-ipfire.menu | 4 +- config/menu/70-log.menu | 46 +++--- config/upnp/gatedesc.xml | 42 +++--- doc/language_issues.de | 35 ++--- doc/language_issues.en | 35 ++--- langs/de/cgi-bin/de.pl | 153 ++++++++++---------- langs/en/cgi-bin/en.pl | 151 ++++++++++---------- lfs/dhcpcd | 2 +- make.sh | 4 + src/initscripts/init.d/net/common/dhcpcd | 12 +- src/initscripts/init.d/net/ifdown | 10 +- src/initscripts/init.d/net/ifup | 19 ++- src/initscripts/init.d/net/red/isdn | 70 ++++++++++ src/initscripts/init.d/net/red/pppoe | 8 +- src/initscripts/init.d/net/red/update | 121 ++++++++++++++++ src/initscripts/init.d/network | 20 ++- src/initscripts/init.d/winbind | 50 +++++++ src/scripts/vpn-watch | 171 +++++++++++++++++++++++ tools/check_strings.pl | 1 + 26 files changed, 779 insertions(+), 343 deletions(-) create mode 100644 src/initscripts/init.d/net/red/isdn create mode 100644 src/initscripts/init.d/net/red/update create mode 100644 src/initscripts/init.d/winbind create mode 100755 src/scripts/vpn-watch diff --git a/config/etc/bashrc b/config/etc/bashrc index 5a05df8239..4ff17b7b25 100644 --- a/config/etc/bashrc +++ b/config/etc/bashrc @@ -26,8 +26,8 @@ alias ls='ls --color=auto' # PS1 Environment Variable for a great case study behind this script # addendum.] -export PS1="\033[0m[\033[1;33m\u\033[1;37m@\033[1;32m\]\h \033[1;31m\w\033[0m]\\$ " -#export PS1="[\u@\h \w]\\$ " +#export PS1="\033[0m[\033[1;33m\u\033[1;37m@\033[1;32m\]\h \033[1;31m\w\033[0m]\\$ " +export PS1="[\u@\h \w]\\$ " #export PS1='\u@\h:\w\$ ' # End /etc/bashrc diff --git a/config/menu/00-menu.main b/config/menu/00-menu.main index 3ba58c4909..a53fa5a5ab 100644 --- a/config/menu/00-menu.main +++ b/config/menu/00-menu.main @@ -1,24 +1,24 @@ - $menu->{'01.system'} = {'caption' => $tr{'alt system'}, + $menu->{'01.system'} = {'caption' => $Lang::tr{'alt system'}, 'enabled' => 1, 'subMenu' => $subsystem }; - $menu->{'02.status'} = {'caption' => $tr{'status'}, + $menu->{'02.status'} = {'caption' => $Lang::tr{'status'}, 'enabled' => 1, 'subMenu' => $substatus }; - $menu->{'03.network'} = {'caption' => $tr{'network'}, + $menu->{'03.network'} = {'caption' => $Lang::tr{'network'}, 'enabled' => 1, 'subMenu' => $subnetwork }; - $menu->{'04.services'} = {'caption' => $tr{'alt services'}, + $menu->{'04.services'} = {'caption' => $Lang::tr{'alt services'}, 'enabled' => 1, 'subMenu' => $subservices }; - $menu->{'05.firewall'} = {'caption' => $tr{'firewall'}, + $menu->{'05.firewall'} = {'caption' => $Lang::tr{'firewall'}, 'enabled' => 1, 'subMenu' => $subfirewall }; - $menu->{'06.proxy'} = {'caption' => $tr{'alt proxy'}, + $menu->{'06.proxy'} = {'caption' => $Lang::tr{'alt proxy'}, 'enabled' => 1, 'subMenu' => $subproxy }; @@ -26,7 +26,7 @@ 'enabled' => 1, 'subMenu' => $subipfire }; - $menu->{'08.logs'} = {'caption' => $tr{'alt logs'}, + $menu->{'08.logs'} = {'caption' => $Lang::tr{'alt logs'}, 'enabled' => 1, 'subMenu' => $sublogs }; diff --git a/config/menu/10-system.menu b/config/menu/10-system.menu index 229687bc73..47d70f650d 100644 --- a/config/menu/10-system.menu +++ b/config/menu/10-system.menu @@ -1,42 +1,42 @@ $subsystem->{'10.home'} = { - 'caption' => $tr{'alt home'}, + 'caption' => $Lang::tr{'alt home'}, 'uri' => '/cgi-bin/index.cgi', - 'title' => "$tr{'alt home'}", + 'title' => "$Lang::tr{'alt home'}", 'enabled' => 1, }; $subsystem->{'20.dialup'} = { - 'caption' => $tr{'alt dialup'}, + 'caption' => $Lang::tr{'alt dialup'}, 'uri' => '/cgi-bin/pppsetup.cgi', - 'title' => "$tr{'alt dialup'}", + 'title' => "$Lang::tr{'alt dialup'}", 'enabled' => 1, }; $subsystem->{'30.passwords'} = { - 'caption' => $tr{'sspasswords'}, + 'caption' => $Lang::tr{'sspasswords'}, 'uri' => '/cgi-bin/changepw.cgi', - 'title' => "$tr{'sspasswords'}", + 'title' => "$Lang::tr{'sspasswords'}", 'enabled' => 1, }; $subsystem->{'40.ssh'} = { - 'caption' => $tr{'ssh access'}, + 'caption' => $Lang::tr{'ssh access'}, 'uri' => '/cgi-bin/remote.cgi', - 'title' => "$tr{'ssh access'}", + 'title' => "$Lang::tr{'ssh access'}", 'enabled' => 1, }; $subsystem->{'50.gui'} = { - 'caption' => $tr{'gui settings'}, + 'caption' => $Lang::tr{'gui settings'}, 'uri' => '/cgi-bin/gui.cgi', - 'title' => "$tr{'gui settings'}", + 'title' => "$Lang::tr{'gui settings'}", 'enabled' => 1, }; $subsystem->{'60.shutdown'} = { - 'caption' => $tr{'shutdown'}, + 'caption' => $Lang::tr{'shutdown'}, 'uri' => '/cgi-bin/shutdown.cgi', - 'title' => "$tr{'shutdown'} / $tr{'reboot'}", + 'title' => "$Lang::tr{'shutdown'} / $Lang::tr{'reboot'}", 'enabled' => 1, }; $subsystem->{'99.credits'} = { - 'caption' => $tr{'credits'}, + 'caption' => $Lang::tr{'credits'}, 'uri' => '/cgi-bin/credits.cgi', - 'title' => "$tr{'credits'}", + 'title' => "$Lang::tr{'credits'}", 'enabled' => 1, }; diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 9c15b974b1..19f1c925eb 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -1,56 +1,56 @@ $substatus->{'10.systemstatus'} = { - 'caption' => $tr{'sssystem status'}, + 'caption' => $Lang::tr{'status'}, 'uri' => '/cgi-bin/status.cgi', - 'title' => "$tr{'sssystem status'}", + 'title' => "$Lang::tr{'status'}", 'enabled' => 1, }; $substatus->{'20.systemgraphs'} = { - 'caption' => $tr{'system graphs'}, + 'caption' => $Lang::tr{'system graphs'}, 'uri' => '/cgi-bin/graphs.cgi', 'novars' => 1, - 'title' => "$tr{'system graphs'}", + 'title' => "$Lang::tr{'system graphs'}", 'enabled' => 1, }; $substatus->{'30.trafficgraphs'} = { - 'caption' => $tr{'sstraffic graphs'}, + 'caption' => $Lang::tr{'sstraffic graphs'}, 'uri' => '/cgi-bin/graphs.cgi', 'vars' => 'graph=network', - 'title' => "$tr{'sstraffic graphs'}", + 'title' => "$Lang::tr{'sstraffic graphs'}", 'enabled' => 1, }; $substatus->{'40.proxygraphs'} = { - 'caption' => $tr{'ssproxy graphs'}, + 'caption' => $Lang::tr{'ssproxy graphs'}, 'uri' => '/cgi-bin/proxygraphs.cgi', - 'title' => "$tr{'ssproxy graphs'}", + 'title' => "$Lang::tr{'ssproxy graphs'}", 'enabled' => 1, }; $substatus->{'50.fwhits'} = { - 'caption' => 'Firewall-Diagramme', - 'uri' => '/cgi-bin/fwhits.cgi', - 'title' => "Firewall-Diagramme", - 'enabled' => 1, - }; + 'caption' => 'Firewall-Diagramme', + 'uri' => '/cgi-bin/fwhits.cgi', + 'title' => "Firewall-Diagramme", + 'enabled' => 1, + }; $substatus->{'60.hardwaregraphs'} = { - 'caption' => "$tr{'hardware graphs'}", - 'uri' => '/cgi-bin/hardwaregraphs.cgi', - 'title' => "$tr{'hardware graphs'}", - 'enabled' => 1, - }; + 'caption' => "$Lang::tr{'hardware graphs'}", + 'uri' => '/cgi-bin/hardwaregraphs.cgi', + 'title' => "$Lang::tr{'hardware graphs'}", + 'enabled' => 1, + }; $substatus->{'70.connections'} = { - 'caption' => $tr{'connections'}, + 'caption' => $Lang::tr{'connections'}, 'uri' => '/cgi-bin/connections.cgi', - 'title' => "$tr{'connections'}", + 'title' => "$Lang::tr{'connections'}", 'enabled' => 1, }; $substatus->{'80.nettraf'} = { - 'caption' => $tr{'sstraffic'}, - 'uri' => '/cgi-bin/traffic.cgi', - 'title' => "$tr{'sstraffic'}", - 'enabled' => 1, - }; + 'caption' => $Lang::tr{'sstraffic'}, + 'uri' => '/cgi-bin/traffic.cgi', + 'title' => "$Lang::tr{'sstraffic'}", + 'enabled' => 1, + }; $substatus->{'90.iptable'} = { - 'caption' => $tr{'iptable rules'}, + 'caption' => $Lang::tr{'iptable rules'}, 'uri' => '/cgi-bin/iptables.cgi', - 'title' => "$tr{'iptable rules'}", + 'title' => "$Lang::tr{'iptable rules'}", 'enabled' => 1, }; diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu index 785a2d8fe8..086cc51f41 100644 --- a/config/menu/30-network.menu +++ b/config/menu/30-network.menu @@ -1,6 +1,6 @@ - $subnetwork->{'10.netconf'} = {'caption' => "$tr{'net config'}", + $subnetwork->{'10.netconf'} = {'caption' => "$Lang::tr{'net config'}", 'uri' => '/cgi-bin/netconfig.cgi', - 'title' => "$tr{'net config'}", + 'title' => "$Lang::tr{'net config'}", 'enabled' => 0, }; $subnetwork->{'20.proxy'} = {'caption' => 'Webproxy', @@ -13,38 +13,38 @@ 'title' => "URL-Filter", 'enabled' => 1, }; - $subnetwork->{'40.dhcp'} = {'caption' => $tr{'dhcp server'}, + $subnetwork->{'40.dhcp'} = {'caption' => $Lang::tr{'dhcp server'}, 'uri' => '/cgi-bin/dhcp.cgi', - 'title' => "$tr{'dhcp server'}", + 'title' => "$Lang::tr{'dhcp server'}", 'enabled' => 1, }; $subnetwork->{'50.scheduler'} = { - 'caption' => $tr{'connscheduler'}, + 'caption' => $Lang::tr{'connscheduler'}, 'uri' => '/cgi-bin/connscheduler.cgi', - 'title' => "$tr{'connscheduler'}", + 'title' => "$Lang::tr{'connscheduler'}", 'enabled' => 1, }; $subnetwork->{'60.hosts'} = { - 'caption' => $tr{'edit hosts'}, + 'caption' => $Lang::tr{'edit hosts'}, 'uri' => '/cgi-bin/hosts.cgi', - 'title' => "$tr{'edit hosts'}", + 'title' => "$Lang::tr{'edit hosts'}", 'enabled' => 1, }; $subnetwork->{'70.upload'} = { - 'caption' => $tr{'upload'}, + 'caption' => $Lang::tr{'upload'}, 'uri' => '/cgi-bin/upload.cgi', - 'title' => "$tr{'upload'}", + 'title' => "$Lang::tr{'upload'}", 'enabled' => 0, }; $subnetwork->{'80.aliases'} = { - 'caption' => $tr{'aliases'}, + 'caption' => $Lang::tr{'aliases'}, 'uri' => '/cgi-bin/aliases.cgi', - 'title' => "$tr{'aliases'}", + 'title' => "$Lang::tr{'aliases'}", 'enabled' => 0, }; $subnetwork->{'90.wakeonlan'} = { - 'caption' => $tr{'WakeOnLan'}, + 'caption' => $Lang::tr{'WakeOnLan'}, 'uri' => '/cgi-bin/wakeonlan.cgi', - 'title' => "$tr{'WakeOnLan'}", + 'title' => "$Lang::tr{'WakeOnLan'}", 'enabled' => 1, }; diff --git a/config/menu/40-services.menu b/config/menu/40-services.menu index f1dc38e640..9901e8f3f1 100644 --- a/config/menu/40-services.menu +++ b/config/menu/40-services.menu @@ -1,23 +1,23 @@ $subservices->{'10.ipsec'} = { 'caption' => 'IPSec', 'uri' => '/cgi-bin/vpnmain.cgi', - 'title' => "$tr{'virtual private networking'}", + 'title' => "$Lang::tr{'virtual private networking'}", 'enabled' => 1, }; $subservices->{'20.openvpn'} = { 'caption' => 'OpenVPN', 'uri' => '/cgi-bin/ovpnmain.cgi', - 'title' => "$tr{'virtual private networking'}", + 'title' => "$Lang::tr{'virtual private networking'}", 'enabled' => 1, }; - $subservices->{'30.dyndns'} = {'caption' => $tr{'dynamic dns'}, + $subservices->{'30.dyndns'} = {'caption' => $Lang::tr{'dynamic dns'}, 'uri' => '/cgi-bin/ddns.cgi', - 'title' => "$tr{'dynamic dns'}", + 'title' => "$Lang::tr{'dynamic dns'}", 'enabled' => 1, }; - $subservices->{'40.time'} = {'caption' => $tr{'time server'}, + $subservices->{'40.time'} = {'caption' => $Lang::tr{'time server'}, 'uri' => '/cgi-bin/time.cgi', - 'title' => "$tr{'time server'}", + 'title' => "$Lang::tr{'time server'}", 'enabled' => 1, }; $subservices->{'50.qos'} = {'caption' => 'Quality of Service', @@ -25,10 +25,10 @@ 'title' => "Quality of Service", 'enabled' => 1, }; - $subservices->{'60.ids'} = {'caption' => $tr{'intrusion detection'}, + $subservices->{'60.ids'} = {'caption' => $Lang::tr{'intrusion detection'}, 'enabled' => 1, 'uri' => '/cgi-bin/ids.cgi', - 'title' => "$tr{'intrusion detection system'}", + 'title' => "$Lang::tr{'intrusion detection system'}", }; $subservices->{'70.extrahd'} = {'caption' => "ExtraHD", 'enabled' => 1, diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu index 54c6e40493..94b2f5e1bb 100644 --- a/config/menu/50-firewall.menu +++ b/config/menu/50-firewall.menu @@ -1,31 +1,31 @@ $subfirewall->{'10.dnat'} = { - 'caption' => $tr{'ssport forwarding'}, + 'caption' => $Lang::tr{'ssport forwarding'}, 'uri' => '/cgi-bin/portfw.cgi', - 'title' => "$tr{'ssport forwarding'}", + 'title' => "$Lang::tr{'ssport forwarding'}", 'enabled' => 1, }; $subfirewall->{'20.xtaccess'} = { - 'caption' => $tr{'external access'}, + 'caption' => $Lang::tr{'external access'}, 'uri' => '/cgi-bin/xtaccess.cgi', - 'title' => "$tr{'external access'}", + 'title' => "$Lang::tr{'external access'}", 'enabled' => 1, }; $subfirewall->{'30.wireless'} = { - 'caption' => $tr{'blue access'}, + 'caption' => $Lang::tr{'blue access'}, 'uri' => '/cgi-bin/wireless.cgi', - 'title' => "$tr{'blue access'}", + 'title' => "$Lang::tr{'blue access'}", 'enabled' => 1, }; $subfirewall->{'40.dmz'} = { - 'caption' => $tr{'ssdmz pinholes'}, + 'caption' => $Lang::tr{'ssdmz pinholes'}, 'uri' => '/cgi-bin/dmzholes.cgi', - 'title' => "$tr{'dmz pinhole configuration'}", + 'title' => "$Lang::tr{'dmz pinhole configuration'}", 'enabled' => 1, }; $subfirewall->{'50.outgoing'} = { - 'caption' => $tr{'outgoing firewall'}, + 'caption' => $Lang::tr{'outgoing firewall'}, 'uri' => '/cgi-bin/outgoingfw.cgi', - 'title' => "$tr{'outgoing firewall'}", + 'title' => "$Lang::tr{'outgoing firewall'}", 'enabled' => 1, }; $subfirewall->{'60.upnp'} = { @@ -35,8 +35,8 @@ 'enabled' => 1, }; $subfirewall->{'70.fwopts'} = { - 'caption' => $tr{'options fw'}, + 'caption' => $Lang::tr{'options fw'}, 'uri' => '/cgi-bin/optionsfw.cgi', - 'title' => "$tr{'options fw'}", + 'title' => "$Lang::tr{'options fw'}", 'enabled' => 1, }; diff --git a/config/menu/60-ipfire.menu b/config/menu/60-ipfire.menu index 37e332ffc3..e0d1a8c4dc 100644 --- a/config/menu/60-ipfire.menu +++ b/config/menu/60-ipfire.menu @@ -13,8 +13,8 @@ 'title' => "Samba", 'enabled' => 1, }; - $subipfire->{'99.help'} = {'caption' => $tr{'help'}, + $subipfire->{'99.help'} = {'caption' => $Lang::tr{'help'}, 'uri' => '/cgi-bin/help.cgi', - 'title' => "$tr{'help'}", + 'title' => "$Lang::tr{'help'}", 'enabled' => 1, }; diff --git a/config/menu/70-log.menu b/config/menu/70-log.menu index b3c1c44aa9..26c0527f6f 100644 --- a/config/menu/70-log.menu +++ b/config/menu/70-log.menu @@ -1,46 +1,56 @@ - $sublogs->{'10.summary'} = {'caption' => $tr{'log summary'}, + $sublogs->{'10.summary'} = {'caption' => $Lang::tr{'log summary'}, 'uri' => '/cgi-bin/logs.cgi/summary.dat', - 'title' => "$tr{'log summary'}", + 'title' => "$Lang::tr{'log summary'}", 'enabled' => 1 }; - $sublogs->{'20.settings'} = {'caption' => $tr{'log settings'}, + $sublogs->{'20.settings'} = {'caption' => $Lang::tr{'log settings'}, 'uri' => '/cgi-bin/logs.cgi/config.dat', - 'title' => "$tr{'log settings'}", + 'title' => "$Lang::tr{'log settings'}", 'enabled' => 1 }; - $sublogs->{'30.proxy'} = {'caption' => $tr{'proxy logs'}, + $sublogs->{'30.proxy'} = {'caption' => $Lang::tr{'proxy logs'}, 'uri' => '/cgi-bin/logs.cgi/proxylog.dat', - 'title' => "$tr{'proxy logs'}", + 'title' => "$Lang::tr{'proxy logs'}", 'enabled' => 1 }; - $sublogs->{'40.firewall'} = {'caption' => $tr{'firewall logs'}, + $sublogs->{'40.firewall'} = {'caption' => $Lang::tr{'firewall logs'}, 'uri' => '/cgi-bin/logs.cgi/firewalllog.dat', - 'title' => "$tr{'firewall logs'}", + 'title' => "$Lang::tr{'firewall logs'}", 'enabled' => 1 }; - $sublogs->{'50.ids'} = {'caption' => $tr{'ids logs'}, + $sublogs->{'41.firewallip'} = {'caption' => $Lang::tr{'firewall logs ip'}, + 'uri' => '/cgi-bin/logs.cgi/firewalllogip.dat', + 'title' => "$Lang::tr{'firewall logs ip'}", + 'enabled' => 1 + }; + $sublogs->{'42.firewallport'} = {'caption' => $Lang::tr{'firewall logs port'}, + 'uri' => '/cgi-bin/logs.cgi/firewalllogport.dat', + 'title' => "$Lang::tr{'firewall logs port'}", + 'enabled' => 1 + }; + $sublogs->{'50.ids'} = {'caption' => $Lang::tr{'ids logs'}, 'uri' => '/cgi-bin/logs.cgi/ids.dat', - 'title' => "$tr{'ids logs'}", + 'title' => "$Lang::tr{'ids logs'}", 'enabled' => 1 }; $sublogs->{'60.urlfilter'} = { - 'caption' => $tr{'urlfilter logs'}, + 'caption' => $Lang::tr{'urlfilter logs'}, 'uri' => '/cgi-bin/logs.cgi/urlfilter.dat', - 'title' => "$tr{'urlfilter log'}", + 'title' => "$Lang::tr{'urlfilter log'}", 'enabled' => 1, }; - $sublogs->{'70.openvpn'} = {'caption' => $tr{'openvpn log'}, + $sublogs->{'70.openvpn'} = {'caption' => $Lang::tr{'openvpn log'}, 'uri' => '/cgi-bin/logs.cgi/openvpn.dat', - 'title' => "$tr{'openvpn log'}", + 'title' => "$Lang::tr{'openvpn log'}", 'enabled' => 1 }; - $sublogs->{'80.system'} = {'caption' => $tr{'system logs'}, + $sublogs->{'80.system'} = {'caption' => $Lang::tr{'system logs'}, 'uri' => '/cgi-bin/logs.cgi/log.dat', - 'title' => "$tr{'system logs'}", + 'title' => "$Lang::tr{'system logs'}", 'enabled' => 1 }; - $sublogs->{'90.userlog'} = {'caption' => $tr{'user proxy logs'}, + $sublogs->{'90.userlog'} = {'caption' => $Lang::tr{'user proxy logs'}, 'uri' => '/cgi-bin/logs.cgi/userlog.dat', - 'title' => "$tr{'user log'}", + 'title' => "$Lang::tr{'user log'}", 'enabled' => 1 }; diff --git a/config/upnp/gatedesc.xml b/config/upnp/gatedesc.xml index 49d2406b4d..07dc07be7f 100755 --- a/config/upnp/gatedesc.xml +++ b/config/upnp/gatedesc.xml @@ -6,10 +6,10 @@ urn:schemas-upnp-org:device:InternetGatewayDevice:1 - IpFire Upnp Device - IpFire Project + IPFire UPnP Device + IPFire Project http://www.ipfire.org - IGD Version 0.92 + IPFire 2.1 uuid:75802409-bccb-40e7-8e6c-fa095ecce13e @@ -21,25 +21,25 @@ - - urn:schemas-dummy-com:service:Dummy:1 - urn:dummy-com:serviceId:dummy1 - /dummy - /dummy - /dummy.xml - - + + urn:schemas-dummy-com:service:Dummy:1 + urn:dummy-com:serviceId:dummy1 + /dummy + /dummy + /dummy.xml + + urn:schemas-upnp-org:device:WANDevice:1 WANDevice - IpFire Project + IPFire Project http://www.ipfire.org WAN Device on Linux IGD - Linux IGD - 0.92 + IPFire + 2.1 http://linux-igd.sourceforge.net - 0.92 + 2.1 uuid:75802409-bccb-40e7-8e6c-fa095ecce13e Linux IGD @@ -54,14 +54,14 @@ urn:schemas-upnp-org:device:WANConnectionDevice:1 - WANConnectionDevice - IpFire Project + Internet Connection + IPFire Project http://www.ipfire.org - WanConnectionDevice on Linux IGD - Linux IGD - 0.92 + Internet connection on Linux IPFire Firewall + IPFire + 2.1 http://www.ipfire.org - 0.92 + 2.1 uuid:75802409-bccb-40e7-8e6c-fa095ecce13e Linux IGD diff --git a/doc/language_issues.de b/doc/language_issues.de index ee05133760..b251e63150 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -28,15 +28,9 @@ WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy no cre groups WARNING: translation string unused: advproxy ssadvanced proxy WARNING: translation string unused: advproxy update notification -WARNING: translation string unused: aliases WARNING: translation string unused: all updates installed -WARNING: translation string unused: alt dialup -WARNING: translation string unused: alt home WARNING: translation string unused: alt information -WARNING: translation string unused: alt logs WARNING: translation string unused: alt ovpn -WARNING: translation string unused: alt services -WARNING: translation string unused: alt system WARNING: translation string unused: alt vpn WARNING: translation string unused: and WARNING: translation string unused: apply @@ -55,7 +49,6 @@ WARNING: translation string unused: backup password WARNING: translation string unused: backup sets WARNING: translation string unused: backup to floppy WARNING: translation string unused: bad characters in -WARNING: translation string unused: blue access WARNING: translation string unused: blue access use hint WARNING: translation string unused: blue interface WARNING: translation string unused: buffered memory @@ -66,7 +59,6 @@ WARNING: translation string unused: cached memory WARNING: translation string unused: cfg restart WARNING: translation string unused: choose config WARNING: translation string unused: clear cache -WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -103,7 +95,6 @@ WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: download WARNING: translation string unused: dynamic dns client -WARNING: translation string unused: edit hosts WARNING: translation string unused: enable javascript WARNING: translation string unused: enabled on WARNING: translation string unused: enabledtitle @@ -121,12 +112,9 @@ WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: filename -WARNING: translation string unused: firewall WARNING: translation string unused: firewall log viewer -WARNING: translation string unused: firewall logs WARNING: translation string unused: firmware WARNING: translation string unused: force update WARNING: translation string unused: free memory @@ -138,7 +126,6 @@ WARNING: translation string unused: genkey WARNING: translation string unused: graph per WARNING: translation string unused: green interface WARNING: translation string unused: gz with key -WARNING: translation string unused: hardware graphs WARNING: translation string unused: hdd temperature in WARNING: translation string unused: hint WARNING: translation string unused: host configuration @@ -147,7 +134,6 @@ WARNING: translation string unused: hours2 WARNING: translation string unused: id WARNING: translation string unused: idle cpu WARNING: translation string unused: idle cpu usage -WARNING: translation string unused: ids logs WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -156,7 +142,6 @@ WARNING: translation string unused: incorrect password WARNING: translation string unused: insert floppy WARNING: translation string unused: install new update WARNING: translation string unused: installed -WARNING: translation string unused: intrusion detection WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered @@ -166,7 +151,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: ipfire side is invalid -WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version @@ -221,7 +205,6 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing traffic in bytes per second WARNING: translation string unused: ovpn WARNING: translation string unused: ovpn config @@ -231,9 +214,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: password crypting key +WARNING: translation string unused: pc WARNING: translation string unused: pots WARNING: translation string unused: profiles -WARNING: translation string unused: proxy logs WARNING: translation string unused: proxy no proxy extend WARNING: translation string unused: proxy no proxy local WARNING: translation string unused: psk @@ -255,14 +238,9 @@ WARNING: translation string unused: shared memory WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache -WARNING: translation string unused: ssdmz pinholes WARNING: translation string unused: ssh access tip WARNING: translation string unused: ssnetwork status -WARNING: translation string unused: sspasswords -WARNING: translation string unused: ssport forwarding -WARNING: translation string unused: ssproxy graphs WARNING: translation string unused: sssystem status -WARNING: translation string unused: sstraffic graphs WARNING: translation string unused: successfully refreshed updates list WARNING: translation string unused: swap usage per WARNING: translation string unused: system cpu @@ -277,7 +255,6 @@ WARNING: translation string unused: this is not a valid archive WARNING: translation string unused: this is not an authorised update WARNING: translation string unused: this update is already installed WARNING: translation string unused: time date manually reset -WARNING: translation string unused: time server WARNING: translation string unused: title WARNING: translation string unused: to WARNING: translation string unused: to install an update @@ -299,7 +276,6 @@ WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username WARNING: translation string unused: uptime and users WARNING: translation string unused: urlfilter background text -WARNING: translation string unused: urlfilter logs WARNING: translation string unused: urlfilter update information WARNING: translation string unused: urlfilter update notification WARNING: translation string unused: urlfilter update results @@ -309,7 +285,7 @@ WARNING: translation string unused: used memory WARNING: translation string unused: used swap WARNING: translation string unused: user cpu WARNING: translation string unused: user cpu usage -WARNING: translation string unused: virtual private networking +WARNING: translation string unused: view log WARNING: translation string unused: vpn on blue WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange @@ -323,13 +299,17 @@ WARNING: untranslated string: IPFires hostname WARNING: untranslated string: Number of IPs for the pie chart WARNING: untranslated string: Number of Ports for the pie chart WARNING: untranslated string: allmsg +WARNING: untranslated string: alt proxy WARNING: untranslated string: dial profile WARNING: untranslated string: down WARNING: untranslated string: firewall graphs +WARNING: untranslated string: help WARNING: untranslated string: invalid input for keepalive 1:2 +WARNING: untranslated string: openvpn log WARNING: untranslated string: otherip WARNING: untranslated string: otherport WARNING: untranslated string: pakfire configuration +WARNING: untranslated string: pc add WARNING: untranslated string: red WARNING: untranslated string: selecttraffic WARNING: untranslated string: settingsc @@ -348,6 +328,9 @@ WARNING: untranslated string: traffics WARNING: untranslated string: trafficsum WARNING: untranslated string: trafficto WARNING: untranslated string: up +WARNING: untranslated string: urlfilter log +WARNING: untranslated string: user log +WARNING: untranslated string: user proxy logs WARNING: untranslated string: wday1 WARNING: untranslated string: wday2 WARNING: untranslated string: wday3 diff --git a/doc/language_issues.en b/doc/language_issues.en index cc0bf1a391..5588290c14 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -29,15 +29,9 @@ WARNING: translation string unused: advproxy no cre groups WARNING: translation string unused: advproxy ssadvanced proxy WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification -WARNING: translation string unused: aliases WARNING: translation string unused: all updates installed -WARNING: translation string unused: alt dialup -WARNING: translation string unused: alt home WARNING: translation string unused: alt information -WARNING: translation string unused: alt logs WARNING: translation string unused: alt ovpn -WARNING: translation string unused: alt services -WARNING: translation string unused: alt system WARNING: translation string unused: alt vpn WARNING: translation string unused: and WARNING: translation string unused: ansi t1.483 @@ -72,7 +66,6 @@ WARNING: translation string unused: backup sets WARNING: translation string unused: backup to floppy WARNING: translation string unused: bewan adsl pci st WARNING: translation string unused: bewan adsl usb -WARNING: translation string unused: blue access WARNING: translation string unused: blue interface WARNING: translation string unused: buffered memory WARNING: translation string unused: bytes per second @@ -83,7 +76,6 @@ WARNING: translation string unused: cfg restart WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: clear cache -WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -114,7 +106,6 @@ WARNING: translation string unused: disk access per WARNING: translation string unused: do not log this port list WARNING: translation string unused: done WARNING: translation string unused: dynamic dns client -WARNING: translation string unused: edit hosts WARNING: translation string unused: enable javascript WARNING: translation string unused: enabled on WARNING: translation string unused: enabledtitle @@ -131,12 +122,9 @@ WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access WARNING: translation string unused: exportkey -WARNING: translation string unused: external access WARNING: translation string unused: external access rule changed WARNING: translation string unused: filename -WARNING: translation string unused: firewall WARNING: translation string unused: firewall log viewer -WARNING: translation string unused: firewall logs WARNING: translation string unused: firmware WARNING: translation string unused: force update WARNING: translation string unused: free memory @@ -150,7 +138,6 @@ WARNING: translation string unused: genkey WARNING: translation string unused: graph per WARNING: translation string unused: green interface WARNING: translation string unused: gz with key -WARNING: translation string unused: hardware graphs WARNING: translation string unused: hdd temperature in WARNING: translation string unused: hint WARNING: translation string unused: host configuration @@ -159,7 +146,6 @@ WARNING: translation string unused: hours2 WARNING: translation string unused: id WARNING: translation string unused: idle cpu WARNING: translation string unused: idle cpu usage -WARNING: translation string unused: ids logs WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -169,7 +155,6 @@ WARNING: translation string unused: insert floppy WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update WARNING: translation string unused: installed -WARNING: translation string unused: intrusion detection WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered @@ -179,7 +164,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: ipfire side is invalid -WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version @@ -235,7 +219,6 @@ WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: other countries WARNING: translation string unused: out -WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing traffic in bytes per second WARNING: translation string unused: ovpn WARNING: translation string unused: ovpn config @@ -244,9 +227,9 @@ WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install +WARNING: translation string unused: pc WARNING: translation string unused: pots WARNING: translation string unused: profiles -WARNING: translation string unused: proxy logs WARNING: translation string unused: psk WARNING: translation string unused: quick control WARNING: translation string unused: read sectors @@ -263,13 +246,8 @@ WARNING: translation string unused: shaping add options WARNING: translation string unused: shared memory WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid -WARNING: translation string unused: ssdmz pinholes WARNING: translation string unused: ssnetwork status -WARNING: translation string unused: sspasswords -WARNING: translation string unused: ssport forwarding -WARNING: translation string unused: ssproxy graphs WARNING: translation string unused: sssystem status -WARNING: translation string unused: sstraffic graphs WARNING: translation string unused: successfully refreshed updates list WARNING: translation string unused: swap usage per WARNING: translation string unused: system cpu @@ -284,7 +262,6 @@ WARNING: translation string unused: this is not a valid archive WARNING: translation string unused: this is not an authorised update WARNING: translation string unused: this update is already installed WARNING: translation string unused: time date manually reset -WARNING: translation string unused: time server WARNING: translation string unused: title WARNING: translation string unused: to WARNING: translation string unused: to install an update @@ -304,7 +281,6 @@ WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username WARNING: translation string unused: uptime and users WARNING: translation string unused: urlfilter background text -WARNING: translation string unused: urlfilter logs WARNING: translation string unused: urlfilter update information WARNING: translation string unused: urlfilter update notification WARNING: translation string unused: urlfilter update results @@ -314,7 +290,7 @@ WARNING: translation string unused: used memory WARNING: translation string unused: used swap WARNING: translation string unused: user cpu WARNING: translation string unused: user cpu usage -WARNING: translation string unused: virtual private networking +WARNING: translation string unused: view log WARNING: translation string unused: vpn on blue WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week @@ -326,14 +302,21 @@ WARNING: translation string unused: yes WARNING: untranslated string: IPFires hostname WARNING: untranslated string: Number of IPs for the pie chart WARNING: untranslated string: Number of Ports for the pie chart +WARNING: untranslated string: alt proxy WARNING: untranslated string: down +WARNING: untranslated string: help +WARNING: untranslated string: openvpn log WARNING: untranslated string: otherip WARNING: untranslated string: otherport WARNING: untranslated string: pakfire configuration +WARNING: untranslated string: pc add WARNING: untranslated string: red WARNING: untranslated string: remove x509 WARNING: untranslated string: settingsc WARNING: untranslated string: up +WARNING: untranslated string: urlfilter log +WARNING: untranslated string: user log +WARNING: untranslated string: user proxy logs WARNING: untranslated string: vpn aggrmode WARNING: untranslated string: vpn altname syntax WARNING: untranslated string: vpn auth-dn diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 9ff82e080a..f317a482a4 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -32,7 +32,12 @@ 'a connection with this name already exists' => 'Eine Verbindung mit diesem Namen existiert bereits.', 'access allowed' => 'Zugriff erlaubt von:', 'access refused with this oinkcode' => 'Zugriff mit diesem Oink Code verweigert', +'accounting' => 'Benutzerverwaltung', +'accounting user nonpdc' => 'Benutzerverwaltung - kein PDC Modus', +'accounting user pdc' => 'Benutzerverwaltung - PDC Modus', 'action' => 'Aktion', +'activate' => 'aktivieren', +'activate user' => 'Benutzer aktivieren', 'add' => 'Hinzufügen', 'add a host' => 'Host hinzufügen:', 'add a new rule' => 'Neue Regel hinzufügen:', @@ -41,11 +46,15 @@ 'add new alias' => 'Neue Alias-Adresse hinzufügen:', 'add new lease' => 'Neue Zuordnung definieren', 'add new ovpn' => 'OpenVPN Einstellungen', +'add pc' => 'PC anlegen', 'add service' => 'Dienst hinzufügen', +'add share' => 'Freigabe anlegen', +'add user' => 'Benutzer anlegen', 'add xtaccess' => 'Externen Zugang hinzugefügt', 'add-route' => 'Additional push route', 'added from dhcp lease list' => 'hinzugefügt von der DHCP Zuordnungsliste', 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.', +'admin users' => 'Liste der Benutzer mit Super User Rechten', 'administrator user password' => 'Passwort für Benutzer "admin":', 'adsl settings' => 'ADSL-Einstellungen', 'advanced' => 'Erweitert', @@ -275,6 +284,7 @@ 'aliases not active' => 'Aliase-Adresse wird erst aktiviert, wenn Ihr ROTES Interface STATISCH ist', 'all' => 'Alle', 'all interfaces' => 'Alle Schnittstellen', +'all services' => 'Alle Dienste', 'all updates installed' => 'Alle Updates installiert', 'alt dialup' => 'Einwahl', 'alt home' => 'Startseite', @@ -316,6 +326,7 @@ 'bad ignore filter' => 'Falscher "Ignorieren"-Filter:', 'bad return code' => 'Das Hilfsprogramm hat einen Fehlercode gemeldet', 'bad source range' => 'Der erste Wert des Quellportbereich ist größer oder gleich dem zweiten Wert.', +'basic options' => 'Basisoptionen', 'beep when ppp connects or disconnects' => 'Piepen, wenn IPFire verbindet oder trennt', 'behind a proxy' => 'Hinter einem Proxy:', 'blue' => 'BLAU', @@ -349,6 +360,7 @@ 'capsclosed' => 'BEENDET', 'capsopen' => 'OFFEN', 'capswarning' => 'WARNUNG', +'caption' => 'Legende', 'cert' => 'Zertifikat', 'certificate' => 'Zertifikat', 'certificate authorities' => 'Zertifizierungsstellen (CAs)', @@ -357,6 +369,7 @@ 'cfg restart' => 'Nach dem Wiederherstellen eines Konfigurationsarchivs wird ein Neustart empfohlen.', 'chain' => 'Verknüpfung', 'change passwords' => 'Passwörter Ã¤ndern', +'change share' => 'Freigabeeinstellungen ändern', 'check vpn lr' => 'Überprüfen', 'choose config' => 'Konfiguration auswaehlen', 'cipher' => 'Verschlüsselung', @@ -365,6 +378,7 @@ 'clenabled' => 'Uhrzeit dem lokalen Netzwerk zur Verfügung stellen', 'click to disable' => 'Aktiviert (klicken, um zu deaktivieren)', 'click to enable' => 'Deaktiviert (klicken, um zu aktivieren)', +'client' => 'PC Name', 'clock has not been synchronized' => 'Die Uhr wurde nicht synchronisiert', 'clock last synchronized at' => 'Die Uhr wurde zuletzt synchronisiert um', 'comment' => 'Kommentar', @@ -403,6 +417,7 @@ 'country' => 'Land', 'cpu usage per' => 'CPU-Nutzung pro', 'create' => 'Erzeuge', +'create mask' => 'UNIX Rechte für neue Dateien', 'create new backup' => 'Einen neuen Sicherungssatz anlegen', 'credits' => 'Credits', 'crl' => 'Certificate Revocation List', @@ -435,6 +450,8 @@ 'ddns hostname removed' => 'Hostname für dynamischen DNS gelöscht', 'ddns minimize updates' => 'Updates minimieren: Vergleicht vor einem Update die DNS-IP-Adresse für Hostname "[host.]domain" gegen die ROTE IP-Addresse.', 'ddns noip prefix' => 'Um no-ip im Gruppenmodus zu benutzen, dem Hostnamen % hinzufügen', +'deactivate' => 'deaktivieren', +'deactivate user' => 'Benutzer deaktivieren', 'debugme' => 'Noch nicht implementiert', 'december' => 'Dezember', 'def lease time' => 'Standardzeit für Zuordnung', @@ -443,6 +460,9 @@ 'default renewal time' => 'Standard-Aktualisierungszeit', 'default services' => 'Standard Dienste', 'delete' => 'Löschen', +'delete pc' => 'PC löschen', +'delete share' => 'Freigabe löschen', +'delete user' => 'Benutzer löschen', 'demon login script' => 'Demon-Anmeldeskript', 'description' => 'Beschreibung', 'dest ip and port' => 'Ziel-IP:Port', @@ -491,6 +511,8 @@ 'dial user password has been changed' => 'Passwort für Benutzer -dial- wurde geändert.', 'dialing mode' => 'Wählmodus:', 'dialup settings' => 'Einwahl-Einstellungen', +'directory mask' => 'UNIX Verzeichnis Rechte', +'directory writeable' => 'Verzeichnis schreibbar', 'disconnect' => 'OVPN Stop / Trennen', 'disk access per' => 'Plattenzugriff je', 'disk usage' => 'Festplattenbelegung:', @@ -512,6 +534,7 @@ 'dod not compatible with ddns' => 'Dial on Demand ist nicht kompatibel mit dynamischen DNS Diensten', 'dod waiting' => 'Dial On Demand wartet', 'domain' => 'Domain', +'domain master' => 'Domain Master', 'domain name' => 'Domainname', 'domain name suffix' => 'Domain-Name-Suffix:', 'domain not set' => 'Domain nicht eingegeben.', @@ -548,6 +571,7 @@ 'edit hosts' => 'Hosts bearbeiten', 'edit network' => 'Netzwerk bearbeiten', 'edit service' => 'Dienst bearbeiten', +'edit share' => 'Freigabe bearbeiten', 'eg' => 'z.B.:', 'empty' => 'Dieses Feld kann leer bleiben', 'empty profile' => 'Unbenannt', @@ -579,6 +603,7 @@ 'esp keylife' => 'Lebensdauer des ESP Schlüssels:', 'esp keylife should be between 1 and 24 hours' => 'ESP Schlüssel-Lebensdauer sollte zwischen 1 und 24 Stunden betragen.', 'every' => 'Jeden', +'exampel' => 'Beispiel', 'excluding buffers and cache' => '-/+ Puffer/Zwischenspeicher', 'expected' => 'Erwartet', 'expires' => 'Ablaufdatum', @@ -599,12 +624,15 @@ 'firewall log' => 'Firewall-Protokoll', 'firewall log viewer' => 'Betrachter der Firewall-Logdateien', 'firewall logs' => 'Firewall-Logdateien', +'firewall logs ip' => 'Firewall-Logdiagramme (IP)', +'firewall logs port' => 'Firewall-Logdiagramme (Port)', 'firmware' => 'Firmware', 'firmware upload' => 'Hochladen der Firmware/Treiber', 'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt', 'fixed ip lease modified' => 'Feste IP-Zuordnung geändert', 'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht', 'force update' => 'Aktualisierung erzwingen', +'force user' => 'Standartbenutzer für das UNIX Dateisystem', 'forwarding rule added' => 'Weiterleitungsregel hinzugefügt. Starte Weiterleitung neu', 'forwarding rule removed' => 'Weiterleitungsregel entfernt. Starte Weiterleitung neu', 'forwarding rule updated' => 'Weiterleitungsregel aktualisiert; starte Weiterleitung neu', @@ -628,6 +656,7 @@ 'graph per' => 'Diagramm pro', 'green' => 'GRÜN', 'green interface' => 'Grünes Interface', +'guest ok' => 'Gastzugang gewähren', 'gui settings' => 'Benutzeroberfläche', 'gz with key' => 'Nur ein verschlüsseltes Archiv kann auf dieser Maschine wiederhergestellt werden.', 'hangup' => 'Trennen', @@ -641,8 +670,10 @@ 'hint' => 'Tipp', 'holdoff' => 'Holdoff-Zeit in (Sekunden)', 'host' => 'Host', +'host allow' => 'Liste der Zugriffsberechtigten', 'host certificate' => 'Host Zertifikat', 'host configuration' => 'Host-Konfiguration', +'host deny' => 'Liste der nicht Zugriffsberechtigten', 'host ip' => 'Host IP-Adresse', 'host to net vpn' => 'Host-zu-Netz Virtual Private Network (RoadWarrior)', 'hostname' => 'Hostname', @@ -688,7 +719,7 @@ 'installed updates' => 'Installierte Updates:', 'instant update' => 'Sofortiges Update', 'interface' => 'Schnittstelle', -'interfaces' => 'Schnittstellen:', +'interfaces' => 'Interfaces', 'internet' => 'INTERNET', 'intrusion detection' => 'Einbruchdetektierung', 'intrusion detection system' => 'Intrusion Detection System', @@ -751,6 +782,7 @@ 'invalid time period' => 'Unzulässiger Zeitabschnitt.', 'invalid uplink speed' => 'Ungültige Uplink-Geschwindigkeit.', 'invalid upstream proxy username or password setting' => 'Ungültige/r Remote-Proxy-Benutzername oder Passwort-Einstellung', +'invalid users' => 'Liste mit Benutzern denen der Zugriff untersagt ist', 'invalid vpi vpci' => 'Ungültige VPI/VPCI-Einstellungen', 'invalid wins address' => 'Ungültige WINS Server Addresse.', 'invert' => 'Invertieren', @@ -793,17 +825,20 @@ 'linkq' => 'Verbindungsqualität', 'loaded modules' => 'Geladene Module:', 'local hard disk' => 'Festplatte', +'local master' => 'Local Master', 'local ntp server specified but not enabled' => 'Lokaler NTP Server angegeben aber nicht aktiviert', 'local subnet' => 'Lokales Subnetz:', 'local subnet is invalid' => 'Lokales Subnet ist ungültig.', 'local vpn hostname/ip' => 'Lokaler VPN Hostname/IP', 'log' => 'Protokoll:', 'log enabled' => 'Log aktiviert', +'log level' => 'Log Level', 'log lines per page' => 'Zeilen pro Seite', 'log server address' => 'Syslog Server', 'log settings' => 'Logdatei-Einstellungen', 'log summaries' => 'Log Übersicht', 'log summary' => 'Log Zusammenfassung', +'log view' => 'Log Anzeige', 'log viewer' => 'Protokollansicht', 'log viewing options' => 'Log Ansichts-Optionen', 'log-options' => 'Logfile options', @@ -827,9 +862,11 @@ 'magic packet send to:' => 'Sende WOL-Paket an', 'main page' => 'Startseite', 'manage ovpn' => '5. Tunnel Management', +'manage shares' => 'Freigaben verwalten', 'manual' => 'Manuell', 'manual control and status' => 'Manuelle Einstellung und Status:', 'manually' => 'Manuell', +'map to guest' => 'Map to Guest', 'march' => 'März', 'marked' => 'Markiert', 'max incoming size' => 'Max. eingehende Größe (kB):', @@ -851,6 +888,7 @@ 'mbmon temp in' => 'Temperature in', 'mbmon value' => 'Wert', 'mbmon volt' => 'Voltage', +'meaning' => 'Bedeutung', 'medium' => 'Mittel', 'memory' => 'Speicher:', 'memory usage per' => 'Speichernutzung pro', @@ -873,8 +911,10 @@ 'monday' => 'Montag', 'month' => 'Monat', 'months' => 'Monate', +'more' => 'weitere', 'mount' => 'Einbinden', 'mounted on' => 'Mounted auf', +'my new share' => 'Meine neue Freigabe', 'name' => 'Name', 'name is invalid' => 'Name ist ungültig', 'name must only contain characters' => 'Name darf nur Buchstaben enthalten.', @@ -886,10 +926,12 @@ 'net config type' => 'Netzwerk-Konfigurations-Typ', 'net config type help' => 'GREEN ist das lokale Netzwerk, RED ist das Internet, BLUE ist WLAN, ORANGE ist die DMZ.', 'net to net vpn' => 'Netz-zu-Netz Virtual Private Network', +'netbios name' => 'Netbios Name', 'netmask' => 'Netzwerkmaske', 'network' => 'Netzwerk', 'network added' => 'Benutzerdefiniertes Netzwerk hinzugefügt', 'network configuration' => 'Netzwerk Konfiguration', +'network options' => 'Netzwerk Optionen', 'network removed' => 'Benutzerdefiniertes Netzwerk entfernt', 'network status information' => 'Netzwerk-Statusinformationen', 'network time' => 'Benutze NTP-Server:', @@ -907,6 +949,7 @@ 'no eciadsl synch.bin file' => 'Keine ECI ADSL Datei synch.bin vorhanden. Bitte hochladen.', 'no fritzdsl driver' => 'Kein Fritz!DSL-Treiber vorhanden. Bitte hochladen.', 'no information available' => 'Keine Informationen verfügbar.', +'no log selected' => 'kein Log ausgewählt', 'no modem selected' => 'Kein Modem ausgewählt', 'no set selected' => 'Es wurde kein Satz ausgewählt', 'no time limit' => 'unbregenzte Zeit', @@ -917,6 +960,7 @@ 'not enough disk space' => 'Nicht genügend Plattenplatz vorhanden', 'not present' => 'Nicht vorhanden', 'not running' => 'nicht gestartet', +'not set' => 'nicht gesetzt', 'november' => 'November', 'ntp configuration' => 'NTP-Konfiguration', 'ntp must be enabled to have clients' => 'Um Clients annehmen zu können, muß NTP vorher aktiviert sein.', @@ -949,6 +993,7 @@ 'organization name' => 'Name der Organisation', 'organization too long' => 'Organisation ist zu lang; sie sollte nicht länger als 60 Zeichen lang sein.', 'original' => 'Original', +'os level' => 'OS Level', 'other countries' => 'Andere Länder', 'other login script' => 'Anderes Anmeldeskript', 'out' => 'Aus', @@ -993,6 +1038,9 @@ 'password too short' => 'Passwort ist zu kurz.', 'passwords do not match' => 'Die Passwörter stimmen nicht überein.', 'passwords must be at least 6 characters in length' => 'Passwörter müssen mind. 6 Zeichen lang sein', +'path to directory' => 'Pfad zur Freigabe', +'pc' => 'PC', +'pdc options' => 'PDC Optionen', 'percentage' => 'Prozent', 'persistent' => 'Dauerhaft', 'pfs yes no' => 'Perfect Forward Secrecy (PFS)', @@ -1009,6 +1057,7 @@ 'pppoe settings' => 'Zusätzliche PPPoE-Einstellungen:', 'pptp settings' => 'Zusätzliche PPTP-Einstellungen:', 'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz', +'prefered master' => 'Prefered Master', 'present' => 'Vorhanden', 'primary dns' => 'Primärer DNS:', 'primary ntp server' => 'Primärer NTP-Server', @@ -1035,6 +1084,7 @@ 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', 'ram' => 'RAM-Speicher', +'read list' => 'Liste der Leseberechtigten', 'read sectors' => 'Sektoren lesen', 'real address' => 'Reale Addresse', 'reboot' => 'Neustart', @@ -1051,6 +1101,7 @@ 'remark' => 'Anmerkung', 'remark title' => 'Anmerkung:', 'remote access' => 'Fernwartung', +'remote announce' => 'Remote Announce', 'remote host/ip' => 'Remote Host/IP', 'remote logging' => 'Remote logging', 'remote subnet' => 'Remote Subnetz:', @@ -1062,13 +1113,15 @@ 'requested data' => '1. Verbindungs Einstellungen', 'reserved dst port' => 'Dieser Zielport ist für die ausschließliche Benutzung durch IPFire reserviert:', 'reserved src port' => 'Dieser Quellport ist für die ausschließliche Benutzung durch IPFire reserviert:', -'reset' => 'Zurücksetzen', +'reset' => 'Zurück setzen', +'reset shares' => 'Freigaben zurücksetzen', 'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Das Zurücksetzen der VPN-Konfiguration wird die Root-CA, die Host-Zertifikate und alle weiteren Zertifikate und alle zertifikatsbasierten Verbindungen entfernen', 'restart' => 'Neustart', 'restart ovpn server' => 'OpenVPN Server neu starten', 'restore' => 'Wiederherstellen', 'restore defaults' => 'Voreinstellungen wiederherstellen', 'restore hardware settings' => 'Hardware-Einstellungen wiederherstellen', +'restore settings' => 'Einstellungen wiederherstellen', 'reverse sort' => 'In umgekehrter chronologischer Reihenfolge sortieren', 'root certificate' => 'Root-Zertifikat', 'root path' => 'Root-Pfad', @@ -1081,9 +1134,13 @@ 'rules already up to date' => 'Regeln sind schon aktuell', 'running' => 'LÄUFT', 'safe removal of umounted device' => 'Sie können gefahrlos das abgemeldete Gerät entfernen', +'samba' => 'Samba', +'samba status' => 'Samba Status', 'saturday' => 'Samstag', 'save' => 'Speichern', +'save config' => 'Einstellungen speichern', 'save error' => 'Konfigurationsarchiv-Datei konnte nicht gespeichert werden', +'save settings' => 'Einstellungen speichern', 'save-adv-options' => 'Erweiterte Optionen speichern', 'script name' => 'Skriptname:', 'secondary dns' => 'Sekundärer DNS:', @@ -1094,6 +1151,8 @@ 'sectors read from disk per second' => 'Von Platte gelesene Sektoren pro Sekunde', 'sectors written to disk per second' => 'Auf Platte geschriebene Sektoren pro Sekunde', 'secure shell server' => 'Secure Shell Server', +'security' => 'Sicherheit', +'security options' => 'Sicherheitsoptionen', 'select' => 'Auswählen', 'select dest net' => 'Auswahl Ziel-Netz', 'select media' => 'Wähle Medium
(nur FAT wird auf entfernbaren Medien unterstützt)', @@ -1102,6 +1161,7 @@ 'september' => 'September', 'serial' => 'serielle', 'server reserved' => 'The connection name server is reserved and not allowed', +'server string' => 'Server String', 'service' => 'Dienst', 'service added' => 'Benutzerdefinierter Netzwerkdienst wurde hinzugefügt', 'service name' => 'Name des Dienstes:', @@ -1110,17 +1170,22 @@ 'servicename' => 'Dienstname', 'services' => 'Dienste:', 'services settings' => 'Firewall - Diensteeinstellungen', +'set' => 'gesetzt', 'set time now' => 'Stelle jetzt die Uhrzeit ein', 'set time now help' => 'Um ein Synchronisationsereignis zu jeder Zeit in die Warteschlange zu stellen, drücken Sie die Stelle jetzt die Uhrzeit ein Schaltfläche. Bitte beachten Sie, daß Sie 5 Minuten, oder länger, warten müssen, bevor ein Sync-Ereignis eintritt.', 'settings' => 'Konfiguration', 'shaping list options' => 'Datenflußkontrolldienste', 'shared' => 'shared', 'shared memory' => 'Gemeins. Speicher', +'sharename' => 'Freigabename', +'shares' => 'Freigaben', 'show ca certificate' => 'CA Zertifikat anzeigen', 'show certificate' => 'Zertifikat anzeigen', 'show crl' => 'Certificate Revocation List anzeigen', 'show host certificate' => 'Host-Zertifikat anzeigen', +'show last x lines' => 'die letzten x Zeilen anzeigen', 'show root certificate' => 'Root-Zertifikat anzeigen', +'show share options' => 'Anzeige der Freigabeeinstellungen', 'shutdown' => 'Herunterfahren', 'shutdown control' => 'Herunterfahren', 'shutdown2' => 'Herunterfahren:', @@ -1236,6 +1301,9 @@ 'unable to alter profiles while red is active' => 'Profile können nicht geändert werden, solange ROT aktiv ist.', 'unable to contact' => 'Kann nicht erreicht werden', 'unencrypted' => 'Nichtverschlüsselt', +'unix group' => ' UNIX Benutzergruppe', +'unix password sync' => 'Unix Password Sync', +'unix shell' => 'UNIX Shell', 'unknown' => 'Unbekannt', 'unnamed' => 'Unbenannt', 'update' => 'Aktualisieren', @@ -1512,6 +1580,7 @@ 'used' => 'Benutzt', 'used memory' => 'Genutzter Speicher', 'used swap' => 'Genutzter Swap', +'user' => 'Benutzer', 'user cpu' => 'Benutzer CPU', 'user cpu usage' => 'Benutzer CPU', 'username' => 'Benutzername:', @@ -1522,8 +1591,10 @@ 'valid root certificate already exists' => 'Ein gültiges Root-Zertifikat existiert bereits.', 'valid till' => 'Gültig bis', 'vci number' => 'VCI-Nummer:', +'view log' => 'Log anzeigen', 'virtual address' => 'Virtuelle Addresse', 'virtual private networking' => 'Virtuelles Privates Netzwerk', +'visible in browselist' => 'Sichtbar in der Verzeichnisliste', 'vpi number' => 'VPI-Nummer:', 'vpn' => 'VPN', 'vpn aggrmode' => 'IKE Aggressive Mode zugelassen. Wenn möglich, vermeiden (preshared Schlüssel wird im Klartext übertragen)!', @@ -1557,11 +1628,14 @@ 'week' => 'Woche', 'weeks' => 'Wochen', 'wildcards' => 'Wildcards', +'wins server' => 'Wins Server', +'wins support' => 'Wins Support', 'wireless' => 'Wireless', 'wireless config added' => 'Wireless Konfiguration hinzugefügt', 'wireless config changed' => 'Wireless Konfiguration geändert', 'wireless configuration' => 'Wireless-Konfiguration', 'wol wakeup' => 'WakeUp', +'workgroup' => 'Arbeitsgruppe', 'written sectors' => 'Sektoren schr.', 'xtaccess all error' => 'Sie können einen externen Zugang nicht auf \'ALL\' setzen - dies erfolgt in den Port-Weiterleitungsregeln.', 'xtaccess bad transfert' => 'Wenn Sie einen Port Zielbereich angeben, muss der Quellbereich identisch sein!', @@ -1570,81 +1644,6 @@ 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Sie können nur eine Roadwarrior Verbindung definieren, wenn die Pre-shared Schlüsselauthentifizierung verwendet wird.
Entweder haben Sie bereits eine Roadwarrior Verbindung mit Pre-shared Schlüsselauthentifizierung, oder Sie versuchen gerade eine hinzuzufügen.', 'your department' => 'Ihre Abteilung', 'your e-mail' => 'Ihre E-mail Adresse', -'samba' => 'Samba', -'all services' => 'Alle Dienste', -'basic options' => 'Basisoptionen', -'workgroup' => 'Arbeitsgruppe', -'netbios name' => 'Netbios Name', -'server string' => 'Server String', -'log level' => 'Log Level', -'interfaces' => 'Interfaces', -'more' => 'weitere', -'security options' => 'Sicherheitsoptionen', -'security' => 'Sicherheit', -'map to guest' => 'Map to Guest', -'unix password sync' => 'Unix Password Sync', -'network options' => 'Netzwerk Optionen', -'os level' => 'OS Level', -'remote announce' => 'Remote Announce', -'wins server' => 'Wins Server', -'wins support' => 'Wins Support', -'local master' => 'Local Master', -'domain master' => 'Domain Master', -'prefered master' => 'Prefered Master', -'pdc options' => 'PDC Optionen', -'save' => 'Speichern', -'reset' => 'Zurück setzen', -'caption' => 'Legende', -'save settings' => 'Einstellungen speichern', -'restore settings' => 'Einstellungen wiederherstellen', -'accounting user pdc' => 'Benutzerverwaltung - PDC Modus', -'accounting user nonpdc' => 'Benutzerverwaltung - kein PDC Modus', -'accounting' => 'Benutzerverwaltung', -'set' => 'gesetzt', -'not set' => 'nicht gesetzt', -'user' => 'Benutzer', -'pc' => 'PC', -'activate' => 'aktivieren', -'deactivate' => 'deaktivieren', -'add user' => 'Benutzer anlegen', -'add pc' => 'PC anlegen', -'delete user' => 'Benutzer löschen', -'delete pc' => 'PC löschen', -'activate user' => 'Benutzer aktivieren', -'deactivate user' => 'Benutzer deaktivieren', -'save config' => 'Einstellungen speichern', -'unix group' => ' UNIX Benutzergruppe', -'unix shell' => 'UNIX Shell', -'client' => 'PC Name', -'shares' => 'Freigaben', -'sharename' => 'Freigabename', -'manage shares' => 'Freigaben verwalten', -'add share' => 'Freigabe anlegen', -'edit share' => 'Freigabe bearbeiten', -'reset shares' => 'Freigaben zurücksetzen', -'delete share' => 'Freigabe löschen', -'show share options' => 'Anzeige der Freigabeeinstellungen', -'change share' => 'Freigabeeinstellungen ändern', -'meaning' => 'Bedeutung', -'exampel' => 'Beispiel', -'my new share' => 'Meine neue Freigabe', -'path to directory' => 'Pfad zur Freigabe', -'directory writeable' => 'Verzeichnis schreibbar', -'visible in browselist' => 'Sichtbar in der Verzeichnisliste', -'host allow' => 'Liste der Zugriffsberechtigten', -'host deny' => 'Liste der nicht Zugriffsberechtigten', -'read list' => 'Liste der Leseberechtigten', -'admin users' => 'Liste der Benutzer mit Super User Rechten', -'invalid users' => 'Liste mit Benutzern denen der Zugriff untersagt ist', -'force user' => 'Standartbenutzer für das UNIX Dateisystem', -'directory mask' => 'UNIX Verzeichnis Rechte', -'create mask' => 'UNIX Rechte für neue Dateien', -'guest ok' => 'Gastzugang gewähren', -'samba status' => 'Samba Status', -'log view' => 'Log Anzeige', -'show last x lines' => 'die letzten x Zeilen anzeigen', -'view log' => 'Log anzeigen', -'no log selected' => 'kein Log ausgewählt', ); #EOF diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 21cdfde3e7..093c455f17 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -32,7 +32,12 @@ 'a connection with this name already exists' => 'A connection with this name already exists.', 'access allowed' => 'Access allowed from:', 'access refused with this oinkcode' => 'Access refused with this Oink Code', +'accounting' => 'Accounting', +'accounting user nonpdc' => 'Accounting - none PDC Mode', +'accounting user pdc' => 'Accounting - PDC Mode', 'action' => 'Action', +'activate' => 'activate', +'activate user' => 'activate user', 'add' => 'Add', 'add a host' => 'Add a host:', 'add a new rule' => 'Add a new rule:', @@ -41,11 +46,15 @@ 'add new alias' => 'Add a new alias:', 'add new lease' => 'Add a new fixed lease', 'add new ovpn' => 'OpenVPN Settings:', +'add pc' => 'add workstation', 'add service' => 'Add service', +'add share' => 'add share', +'add user' => 'add User', 'add xtaccess' => 'Add External Access', 'add-route' => 'Additional push route', 'added from dhcp lease list' => 'added from DHCP lease list', 'admin user password has been changed' => 'Admin user password has been changed.', +'admin users' => 'user with superuser rights', 'administrator user password' => 'Admin user password:', 'adsl settings' => 'ADSL settings', 'advanced' => 'Advanced', @@ -276,6 +285,7 @@ 'aliases not active' => 'Aliases will not be active unless your RED interface is STATIC', 'all' => 'All', 'all interfaces' => 'All Interfaces', +'all services' => 'All Services', 'all updates installed' => 'All updates installed', 'allmsg' => 'show all', 'alt dialup' => 'Dialup', @@ -332,6 +342,7 @@ 'bad ignore filter' => 'Bad ignore filter:', 'bad return code' => 'Helper program returned error code', 'bad source range' => 'The Source port range has a first value that is greater than or equal to the second value.', +'basic options' => 'Basic Options', 'beep when ppp connects or disconnects' => 'Beep when IPFire connects or disconnects', 'behind a proxy' => 'Behind a proxy:', 'bewan adsl pci st' => 'TO BE REMOVED', @@ -366,6 +377,7 @@ 'capsclosed' => 'CLOSED', 'capsopen' => 'OPEN', 'capswarning' => 'WARNING', +'caption' => 'Caption', 'cert' => 'Certificate', 'certificate' => 'Certificate', 'certificate authorities' => 'Certificate Authorities', @@ -374,6 +386,7 @@ 'cfg restart' => 'A reboot is suggested after restoring a configuration archive.', 'chain' => 'Chain', 'change passwords' => 'Change passwords', +'change share' => 'edit share options', 'check vpn lr' => 'Check', 'choose config' => 'Choose Config', 'choose media' => 'Choose media', @@ -383,6 +396,7 @@ 'clenabled' => 'Provide time to local network', 'click to disable' => 'Enabled (click to disable)', 'click to enable' => 'Disabled (click to enable)', +'client' => 'Workstation Name', 'clock has not been synchronized' => 'Clock has not been synchronized', 'clock last synchronized at' => 'Clock was last synchronized at', 'comment' => 'Description:', @@ -421,6 +435,7 @@ 'country' => 'Country', 'cpu usage per' => 'CPU Usage per', 'create' => 'Create', +'create mask' => 'UNIX rights for new created files', 'credits' => 'Credits', 'crl' => 'Certificate Revocation List', 'cron server' => 'CRON server', @@ -450,6 +465,8 @@ 'ddns hostname removed' => 'Dynamic DNS hostname removed', 'ddns minimize updates' => 'Minimize updates: before an update, compares the dns IP for hostname "[host.]domain" against RED IP.', 'ddns noip prefix' => 'To use no-ip in group mode, prefix hostname with %', +'deactivate' => 'deactivate', +'deactivate user' => 'deactivate user', 'debugme' => 'Not yet implemented', 'december' => 'December', 'def lease time' => 'Default Lease Time', @@ -458,6 +475,9 @@ 'default renewal time' => 'Default Renewal Time', 'default services' => 'Default services', 'delete' => 'Delete', +'delete pc' => 'delete workstation', +'delete share' => 'delete share', +'delete user' => 'delete User', 'demon login script' => 'Demon login script', 'description' => 'Description', 'dest ip and port' => 'Dest. IP:Port', @@ -505,6 +525,8 @@ 'dial user password has been changed' => 'Dial user password has been changed.', 'dialing mode' => 'Dialing mode:', 'dialup settings' => 'Dialup Settings', +'directory mask' => 'UNIX directory rights', +'directory writeable' => 'directory writeable', 'disconnect' => 'OVPN Stop / Disconnect', 'disk access per' => 'Disk Access per', 'disk usage' => 'Disk usage:', @@ -525,6 +547,7 @@ 'dod not compatible with ddns' => 'Dial on demand is not compatible with dynamic dns services', 'dod waiting' => 'Dial on Demand waiting', 'domain' => 'Domain', +'domain master' => 'Domain Master', 'domain name' => 'Domain name', 'domain name suffix' => 'Domain name suffix:', 'domain not set' => 'Domain not set.', @@ -561,6 +584,7 @@ 'edit hosts' => 'Edit Hosts', 'edit network' => 'Edit network', 'edit service' => 'Edit service', +'edit share' => 'edit share', 'eg' => 'e.g:', 'empty' => 'This field may be left blank', 'empty profile' => 'empty', @@ -591,6 +615,7 @@ 'esp keylife' => 'ESP Keylife:', 'esp keylife should be between 1 and 24 hours' => 'ESP Keylife should be between 1 and 24 hours.', 'every' => 'Every', +'exampel' => 'exampel', 'excluding buffers and cache' => '-/+ buffers/cache', 'expected' => 'Expected', 'expires' => 'Expires', @@ -612,12 +637,15 @@ 'firewall log' => 'Firewall log', 'firewall log viewer' => 'Firewall Log Viewer', 'firewall logs' => 'Firewall Logs', +'firewall logs ip' => 'Firewall Log Graphs (IP)', +'firewall logs port' => 'Firewall Log Graphs (Port)', 'firmware' => 'Firmware', 'firmware upload' => 'Upload Firmware/Drivers', 'fixed ip lease added' => 'Fixed IP lease added', 'fixed ip lease modified' => 'Fixed IP lease modified', 'fixed ip lease removed' => 'Fixed IP lease removed', 'force update' => 'Force update', +'force user' => 'force all new file to user', 'forwarding rule added' => 'Forwarding rule added; restarting forwarder', 'forwarding rule removed' => 'Forwarding rule removed; restarting forwarder', 'forwarding rule updated' => 'Forwarding rule updated; restarting forwarder', @@ -643,6 +671,7 @@ 'graph per' => 'Graph per', 'green' => 'GREEN', 'green interface' => 'Green Interface', +'guest ok' => 'allow guests to access', 'gui settings' => 'GUI Settings', 'gz with key' => 'Only an encrypted archive can be restored on this machine.', 'hangup' => 'Disconnect', @@ -656,8 +685,10 @@ 'hint' => 'Hint:', 'holdoff' => 'Holdoff time (in seconds)', 'host' => 'Host', +'host allow' => 'list with allowed hosts', 'host certificate' => 'Host Certificate', 'host configuration' => 'Host Configuration', +'host deny' => 'list with denied hosts', 'host ip' => 'Host IP address', 'host to net vpn' => 'Host-to-Net Virtual Private Network (RoadWarrior)', 'hostname' => 'Hostname', @@ -704,7 +735,7 @@ 'installed updates' => 'Installed updates:', 'instant update' => 'Instant Update', 'interface' => 'Interface', -'interfaces' => 'Interfaces:', +'interfaces' => 'Interfaces', 'internet' => 'INTERNET', 'intrusion detection' => 'Intrusion Detection', 'intrusion detection system' => 'Intrusion Detection System', @@ -768,6 +799,7 @@ 'invalid time period' => 'Invalid time period', 'invalid uplink speed' => 'Invalid uplink speed.', 'invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting.', +'invalid users' => 'list with users denied to access', 'invalid vpi vpci' => 'Invalid VPI/VPCI settings', 'invalid wins address' => 'Invalid WINS Server address.', 'invert' => 'Invert', @@ -810,17 +842,20 @@ 'linkq' => 'Link Quality', 'loaded modules' => 'Loaded modules:', 'local hard disk' => 'Hard disk', +'local master' => 'Local Master', 'local ntp server specified but not enabled' => 'Local NTP server specified but not enabled', 'local subnet' => 'Local Subnet:', 'local subnet is invalid' => 'Local subnet is invalid.', 'local vpn hostname/ip' => 'Local VPN Hostname/IP', 'log' => 'Log:', 'log enabled' => 'Log Enabled', +'log level' => 'Log Level', 'log lines per page' => 'Lines per page', 'log server address' => 'Syslog server', 'log settings' => 'Log Settings', 'log summaries' => 'Log summaries', 'log summary' => 'Log Summary', +'log view' => 'log view', 'log viewer' => 'Log viewer', 'log viewing options' => 'Log viewing options', 'log-options' => 'Logfile options', @@ -844,9 +879,11 @@ 'magic packet send to:' => 'Magic packet send to:', 'main page' => 'Main page', 'manage ovpn' => '5. Tunnel Management:', +'manage shares' => 'manage shares', 'manual' => 'Manual', 'manual control and status' => 'Manual control and status:', 'manually' => 'Manually', +'map to guest' => 'Map to Guest', 'march' => 'March', 'marked' => 'Marked', 'max incoming size' => 'Max incoming size (KB):', @@ -868,6 +905,7 @@ 'mbmon temp in' => 'Temperature in', 'mbmon value' => 'Value', 'mbmon volt' => 'Voltage', +'meaning' => 'meaning', 'medium' => 'Medium', 'memory' => 'Memory:', 'memory usage per' => 'Memory Usage per', @@ -891,8 +929,10 @@ 'month' => 'Month', 'monthly firewallhits' => 'monthly firewallhits', 'months' => 'months', +'more' => 'more', 'mount' => 'Mount', 'mounted on' => 'Mounted on', +'my new share' => 'My new share', 'name' => 'Name', 'name is invalid' => 'Name is invalid', 'name must only contain characters' => 'Name must only contain characters.', @@ -904,10 +944,12 @@ 'net config type' => 'kind of network configuration', 'net config type help' => 'GREEN is the local network, RED is the internet, BLUE is WLAN, ORANGE is the DMZ.', 'net to net vpn' => 'Net-to-Net Virtual Private Network', +'netbios name' => 'Netbios Name', 'netmask' => 'Netmask', 'network' => 'Network', 'network added' => 'Custom Network added', 'network configuration' => 'Network Configuration', +'network options' => 'Network Options', 'network removed' => 'Custom Network removed', 'network status information' => 'Network Status Information', 'network time' => 'Use a Network Time Server:', @@ -925,6 +967,7 @@ 'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.', 'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.', 'no information available' => 'No information available.', +'no log selected' => 'no log selected', 'no modem selected' => 'No modem selected', 'no set selected' => 'No set was selected', 'no time limit' => 'unlimited time', @@ -935,6 +978,7 @@ 'not enough disk space' => 'Not enough disk space', 'not present' => 'Not present', 'not running' => 'not running', +'not set' => 'not set', 'notes' => 'Notes', 'november' => 'November', 'ntp configuration' => 'NTP configuration', @@ -967,6 +1011,7 @@ 'organization name' => 'Organization Name', 'organization too long' => 'Organization is too long; it should not be longer than 60 characters.', 'original' => 'Original', +'os level' => 'OS Level', 'other countries' => 'Other countries', 'other login script' => 'Other login script', 'out' => 'Out', @@ -1010,6 +1055,9 @@ 'password too short' => 'Password is too short.', 'passwords do not match' => 'Passwords do not match.', 'passwords must be at least 6 characters in length' => 'Passwords must be at least 6 characters in length', +'path to directory' => 'path to share', +'pc' => 'Workstatipon', +'pdc options' => 'PDC Options', 'percentage' => 'Percentage', 'persistent' => 'Persistent', 'pfs yes no' => 'Perfect Forward Secrecy (PFS)', @@ -1026,6 +1074,7 @@ 'pppoe settings' => 'Additional PPPoE settings:', 'pptp settings' => 'Additional PPTP settings:', 'pre-shared key is too short' => 'Pre-shared key is too short.', +'prefered master' => 'Prefered Master', 'present' => 'Present', 'primary dns' => 'Primary DNS:', 'primary ntp server' => 'Primary NTP Server', @@ -1051,6 +1100,7 @@ 'pulse dial' => 'Pulse dial:', 'quick control' => 'Quick Control', 'ram' => 'RAM', +'read list' => 'list with readonly hosts', 'read sectors' => 'Read Sectors', 'real address' => 'Real Address', 'reboot' => 'Reboot', @@ -1067,6 +1117,7 @@ 'remark' => 'Remark', 'remark title' => 'Remark:', 'remote access' => 'Remote access', +'remote announce' => 'Remote Announce', 'remote host/ip' => 'Remote Host/IP', 'remote logging' => 'Remote logging', 'remote subnet' => 'Remote subnet:', @@ -1077,12 +1128,14 @@ 'reserved dst port' => 'Destination port is reserved for IPFire use only:', 'reserved src port' => 'Source port is reserved for IPFire use only:', 'reset' => 'Reset', +'reset shares' => 'reset share', 'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Resetting the VPN configuration will remove the root CA, the host certificate and all certificate based connections', 'restart' => 'Restart', 'restart ovpn server' => 'Restart OpenVPN Server', 'restore' => 'Restore', 'restore defaults' => 'Restore defaults', 'restore hardware settings' => 'Restore hardware settings', +'restore settings' => 'Reset Settings', 'reverse sort' => 'Sort in reverse chronological order', 'root certificate' => 'Root Certificate', 'root user password' => 'root password', @@ -1093,9 +1146,13 @@ 'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPFire:', 'rules already up to date' => 'Rules already up to date', 'running' => 'RUNNING', +'samba' => 'Samba', +'samba status' => 'Samba Status', 'saturday' => 'Saturday', 'save' => 'Save', +'save config' => 'save settings', 'save error' => 'Unable to save configuration archive file', +'save settings' => 'Save Settings', 'save-adv-options' => 'Save Advanced options', 'script name' => 'Script name:', 'secondary dns' => 'Secondary DNS:', @@ -1106,6 +1163,8 @@ 'sectors read from disk per second' => 'Sectors read from disk per second', 'sectors written to disk per second' => 'Sectors written to disk per second', 'secure shell server' => 'Secure shell server', +'security' => 'Security', +'security options' => 'Security Options', 'select' => 'Select', 'select dest net' => 'Select a destination net.', 'select source net' => 'Select a source net. If you have no Orange or Blue net configured, you need no DMZ Pinholes.', @@ -1114,6 +1173,7 @@ 'september' => 'September', 'serial' => 'Serial', 'server reserved' => 'The connection name server is reserved and not allowed', +'server string' => 'Server String', 'service' => 'Service', 'service added' => 'Custom Network Service added', 'service name' => 'Service name:', @@ -1122,6 +1182,7 @@ 'servicename' => 'Service Name', 'services' => 'Services:', 'services settings' => 'Firewall - Services settings', +'set' => 'set', 'set time now' => 'Set Time Now', 'set time now help' => 'To queue a synchronization event at any time (even while using a repeating schedule), press the Set Time Now button. Please note that you may have to wait for five minutes, or more, before a sync event occurs.', 'settings' => 'Settings', @@ -1129,13 +1190,17 @@ 'shaping list options' => 'Traffic shaping services', 'shared' => 'shared', 'shared memory' => 'Shared Memory', +'sharename' => 'Sharename', +'shares' => 'Shares', 'show areas' => 'show areas', 'show ca certificate' => 'Show CA Certificate', 'show certificate' => 'Show Certificate', 'show crl' => 'Show Certificate Revocation List', 'show host certificate' => 'Show Host Certificate', +'show last x lines' => 'show last x lines', 'show lines' => 'show lines', 'show root certificate' => 'Show Root Certificate', +'show share options' => 'show shares options', 'shutdown' => 'Shutdown', 'shutdown control' => 'Shutdown control', 'shutdown2' => 'Shutdown:', @@ -1258,6 +1323,9 @@ 'unable to alter profiles while red is active' => 'Unable to alter profiles while RED is active.', 'unable to contact' => 'Unable to contact', 'unencrypted' => 'Unencrypted', +'unix group' => ' UNIX usergroup', +'unix password sync' => 'Unix Password Sync', +'unix shell' => 'UNIX Shell', 'unknown' => 'UNKNOWN', 'unnamed' => 'Unnamed', 'update' => 'Update', @@ -1535,6 +1603,7 @@ 'used' => 'Used', 'used memory' => 'Used Memory', 'used swap' => 'Used Swap', +'user' => 'User', 'user cpu' => 'User CPU', 'user cpu usage' => 'User CPU Usage', 'username' => 'User Name:', @@ -1545,8 +1614,10 @@ 'valid root certificate already exists' => 'A valid root certificate already exists.', 'valid till' => 'Valid till', 'vci number' => 'VCI Number:', +'view log' => 'view log', 'virtual address' => 'Virtual Address', 'virtual private networking' => 'Virtual Private Networking', +'visible in browselist' => 'visible in browselist', 'vpi number' => 'VPI Number:', 'vpn' => 'VPN', 'vpn configuration main' => 'VPN configuration - Main', @@ -1566,11 +1637,14 @@ 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'weeks', 'wildcards' => 'Wildcards', +'wins server' => 'Wins Server', +'wins support' => 'Wins Support', 'wireless' => 'Wireless', 'wireless config added' => 'Wireless config added', 'wireless config changed' => 'Wireless config changed', 'wireless configuration' => 'Wireless Configuration', 'wol wakeup' => 'WakeUp', +'workgroup' => 'Workgroup', 'written sectors' => 'Written Sectors', 'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.', 'year' => 'Year', @@ -1579,81 +1653,6 @@ 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.
Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.', 'your department' => 'Your Department', 'your e-mail' => 'Your E-mail Address', -'samba' => 'Samba', -'all services' => 'All Services', -'basic options' => 'Basic Options', -'workgroup' => 'Workgroup', -'netbios name' => 'Netbios Name', -'server string' => 'Server String', -'log level' => 'Log Level', -'interfaces' => 'Interfaces', -'more' => 'more', -'security options' => 'Security Options', -'security' => 'Security', -'map to guest' => 'Map to Guest', -'unix password sync' => 'Unix Password Sync', -'network options' => 'Network Options', -'os level' => 'OS Level', -'remote announce' => 'Remote Announce', -'wins server' => 'Wins Server', -'wins support' => 'Wins Support', -'local master' => 'Local Master', -'domain master' => 'Domain Master', -'prefered master' => 'Prefered Master', -'pdc options' => 'PDC Options', -'save' => 'Save', -'reset' => 'Reset', -'caption' => 'Caption', -'save settings' => 'Save Settings', -'restore settings' => 'Reset Settings', -'accounting user pdc' => 'Accounting - PDC Mode', -'accounting user nonpdc' => 'Accounting - none PDC Mode', -'accounting' => 'Accounting', -'set' => 'set', -'not set' => 'not set', -'user' => 'User', -'pc' => 'Workstatipon', -'activate' => 'activate', -'deactivate' => 'deactivate', -'add user' => 'add User', -'add pc' => 'add workstation', -'delete user' => 'delete User', -'delete pc' => 'delete workstation', -'activate user' => 'activate user', -'deactivate user' => 'deactivate user', -'save config' => 'save settings', -'unix group' => ' UNIX usergroup', -'unix shell' => 'UNIX Shell', -'client' => 'Workstation Name', -'shares' => 'Shares', -'sharename' => 'Sharename', -'manage shares' => 'manage shares', -'add share' => 'add share', -'edit share' => 'edit share', -'reset shares' => 'reset share', -'delete share' => 'delete share', -'show share options' => 'show shares options', -'change share' => 'edit share options', -'meaning' => 'meaning', -'exampel' => 'exampel', -'my new share' => 'My new share', -'path to directory' => 'path to share', -'directory writeable' => 'directory writeable', -'visible in browselist' => 'visible in browselist', -'host allow' => 'list with allowed hosts', -'host deny' => 'list with denied hosts', -'read list' => 'list with readonly hosts', -'admin users' => 'user with superuser rights', -'invalid users' => 'list with users denied to access', -'force user' => 'force all new file to user', -'directory mask' => 'UNIX directory rights', -'create mask' => 'UNIX rights for new created files', -'guest ok' => 'allow guests to access', -'samba status' => 'Samba Status', -'log view' => 'log view', -'show last x lines' => 'show last x lines', -'view log' => 'view log', -'no log selected' => 'no log selected', ); #EOF diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 6ad3b46cfa..2b717875f0 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -76,6 +76,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --mandir=/usr/share/man --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - ln -sf /etc/rc.d/init.d/network $(CONFIG_ROOT)/dhcpc/dhcpcd.exe + ln -sf /etc/rc.d/init.d/net/red/update $(CONFIG_ROOT)/dhcpc/dhcpcd.exe @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index ec37518e1c..4af9a2e48d 100644 --- a/make.sh +++ b/make.sh @@ -949,6 +949,7 @@ svn) svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff evaluate 1 echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff" + svn status ;; esac ;; @@ -1054,6 +1055,9 @@ pxe) esac exit 0 ;; +lang) + update_langs + ;; "") clear svn info diff --git a/src/initscripts/init.d/net/common/dhcpcd b/src/initscripts/init.d/net/common/dhcpcd index f4f9218fed..bad2877ce4 100644 --- a/src/initscripts/init.d/net/common/dhcpcd +++ b/src/initscripts/init.d/net/common/dhcpcd @@ -50,7 +50,7 @@ case "$2" in if [ "$PRINTALL" = "yes" ]; then echo "" echo_ok - boot_mesg " DHCP Assigned Settings for $1:" + boot_mesg " DHCP Assigned Settings for ${1}:" boot_mesg_flush boot_mesg " IP Address: $IPADDR" boot_mesg_flush @@ -68,6 +68,16 @@ case "$2" in boot_mesg " IP Addresss: ""$IPADDR" echo_ok fi + if [ "$DNS1" = "" ]; then + echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 1` > /var/ipfire/red/dns1 + echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 2` > /var/ipfire/red/dns2 + else + echo "$DNS1" > /var/ipfire/red/dns1 + echo "$DNS2" > /var/ipfire/red/dns2 + fi + . /var/ipfire/dhcpc/dhcpcd-${1}.info + echo "$IPADDR" > /var/ipfire/red/local-ipaddress + echo "$GATEWAY" > /var/ipfire/red/remote-ipaddress else echo "" logger -t ipfire "DHCPCD Fail" diff --git a/src/initscripts/init.d/net/ifdown b/src/initscripts/init.d/net/ifdown index 3b80d7d745..494ab66578 100644 --- a/src/initscripts/init.d/net/ifdown +++ b/src/initscripts/init.d/net/ifdown @@ -8,7 +8,7 @@ # Kevin P. Fleming - kpfleming@linuxfromscratch.org # Michael Tremer - mitch@ipfire.org # -# Version : 00.01 +# Version : 01.00 # # Notes : # @@ -47,19 +47,23 @@ then elif [ "$name" == "red" ]; then if [ "${RED_TYPE}" == "PPPOE" ]; then - echo + NAME=${name} /etc/rc.d/init.d/net/red/pppoe ${RED_DEV} down elif [ "${RED_TYPE}" == "PPTP" ]; then echo elif [ "${RED_TYPE}" == "DHCP" ]; then NAME=${name} DHCP_HOSTNAME=${RED_DHCP_HOSTNAME} \ PRINTIP=yes PRINTALL=yes \ - /etc/rc.d/init.d/net/red/dhcpcd ${RED_DEV} down + /etc/rc.d/init.d/net/common/dhcpcd ${RED_DEV} down elif [ "${RED_TYPE}" == "STATIC" ]; then NAME=${name} ADDRESS=${RED_ADDRESS} NETMASK=${RED_NETMASK}\ NETADDRESS=${RED_NETADDRESS} BROADCAST=${RED_BROADCAST} \ DNS1=${DNS1} DNS2=${DNS2} GATEWAY=${DEFAULT_GATEWAY} /etc/rc.d/init.d/net/red/ipv4-static ${RED_DEV} down fi + + ### Cleanup the system when red goes down ### + rm -f /var/ipfire/red/iface + fi else boot_mesg "Interface ${DEVICE} doesn't exist." ${WARNING} diff --git a/src/initscripts/init.d/net/ifup b/src/initscripts/init.d/net/ifup index 50dccc7907..2e1b820a29 100644 --- a/src/initscripts/init.d/net/ifup +++ b/src/initscripts/init.d/net/ifup @@ -22,7 +22,20 @@ boot_mesg "Bringing up the $name interface..." boot_mesg_flush ( + eval $(/usr/local/bin/readhash /var/ipfire/vpn/settings) + eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings) eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings) + + if [ "$name" == "green" ]; then + DEVICE="${GREEN_DEV}" + elif [ "$name" == "blue" ]; then + DEVICE="${BLUE_DEV}" + elif [ "$name" == "orange" ]; then + DEVICE="${ORANGE_DEV}" + elif [ "$name" == "red" ]; then + DEVICE="${RED_DEV}" + fi # Check if an interface is there... if ip link show ${DEVICE} > /dev/null 2>&1; then @@ -62,6 +75,7 @@ boot_mesg_flush echo elif [ "${RED_TYPE}" == "DHCP" ]; then NAME=${name} DHCP_HOSTNAME=${RED_DHCP_HOSTNAME} \ + DNS1=${DNS1} DNS2=${DNS2} \ PRINTIP=yes PRINTALL=yes \ /etc/rc.d/init.d/net/common/dhcpcd ${RED_DEV} up elif [ "${RED_TYPE}" == "STATIC" ]; then @@ -70,7 +84,10 @@ boot_mesg_flush DNS1=${DNS1} DNS2=${DNS2} GATEWAY=${DEFAULT_GATEWAY} /etc/rc.d/init.d/net/common/ipv4-static ${RED_DEV} up fi - fi + + /etc/rc.d/init.d/net/red/update +fi + ) # End $network_devices/ifup diff --git a/src/initscripts/init.d/net/red/isdn b/src/initscripts/init.d/net/red/isdn new file mode 100644 index 0000000000..827b0024a9 --- /dev/null +++ b/src/initscripts/init.d/net/red/isdn @@ -0,0 +1,70 @@ +#!/bin/bash +######################################################################## +# Begin $network_devices/services/isdn +# +# Description : ISDN Script +# +# Authors : Michael Tremer - mitch@ipfire.org +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} +eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings) + +case "${1}" in + up) + boot_mesg "Bringing up the ISDN interface..." + + if [ "$ENABLED" = "on" ]; then + modprobe -r hisax_st5481 2>/dev/null + modprobe -r hisax_fcpcipnp 2>/dev/null + modprobe -r hisax_isac 2>/dev/null + modprobe -r hisax 2>/dev/null + + if [ "$TYPE" = "998" ]; then + modprobe hisax_st5481 protocol=$PROTOCOL $MODULE_PARAMS + (exit $?) + evaluate_retval + elif [ "$TYPE" = "999" ]; then + modprobe hisax_fcpcipnp protocol=$PROTOCOL $MODULE_PARAMS + (exit $?) + evaluate_retval + else + modprobe hisax protocol=$PROTOCOL type=$TYPE $MODULE_PARAMS + (exit $?) + evaluate_retval + fi + + else + logger -t red "ISDN: "No ISDN enabled" + (exit 1) + evaluate_retval + fi + ;; + + down) + boot_mesg "Bringing down the ISDN interface..." + isdnctrl delif ippp1 2>/dev/null || failed=1 + isdnctrl delif ippp0 2>/dev/null || failed=1 + killproc ipppd 2>/dev/null || failed=1 + killproc ibod 2>/dev/null || failed=1 + modprobe -r hisax_st5481 2>/dev/null || failed=1 + modprobe -r hisax_fcpcipnp 2>/dev/null || failed=1 + modprobe -r hisax_isac 2>/dev/null || failed=1 + modprobe -r hisax 2>/dev/null || failed=1 + (exit ${failed}) + evaluate_retval + ;; + + *) + echo "Usage: ${0} {up|down}" + exit 1 + ;; +esac + +# End $network_devices/services/isdn diff --git a/src/initscripts/init.d/net/red/pppoe b/src/initscripts/init.d/net/red/pppoe index 463fe23204..431c2c0e76 100644 --- a/src/initscripts/init.d/net/red/pppoe +++ b/src/initscripts/init.d/net/red/pppoe @@ -50,7 +50,7 @@ case "${2}" in touch /var/ipfire/red/dial-on-demand ARGS+=" demand nopersist connect /bin/true" fi - ARGS+=" active-filter outbound and not icmp[0] == 3 and not tcp[13] & 4 != 0" + DEMAND+=" active-filter outbound and not icmp[0] == 3 and not tcp[13] & 4 != 0" fi ARGS+=" noipdefault default-asyncmap defaultroute hide-password local mtu 1492" @@ -62,7 +62,7 @@ case "${2}" in ARGS+=" debug" fi - $PPPCOMMAND "${PPPOECOMMAND}" $ARGS + $PPPCOMMAND "${PPPOECOMMAND}" $ARGS $DEMAND >/dev/null 2>&1 evaluate_retval else @@ -87,7 +87,7 @@ case "${2}" in touch /var/ipfire/red/dial-on-demand PPPCOMMAND+=" demand nopersist" fi - PPPCOMMAND+=" active-filter outbound and not icmp[0] == 3 & not tcp[13] & 4 != 0" + DEMAND+="active-filter outbound and not icmp[0] == 3 & not tcp[13] & 4 != 0" fi PPPCOMMAND+=" noipdefault defaultroute hide-password ipcp-accept-local" @@ -99,7 +99,7 @@ case "${2}" in PPPCOMMAND+=" debug" fi - $PPPCOMMAND + $PPPCOMMAND $DEMAND >/dev/null 2>&1 evaluate_retval fi diff --git a/src/initscripts/init.d/net/red/update b/src/initscripts/init.d/net/red/update new file mode 100644 index 0000000000..4f2f379def --- /dev/null +++ b/src/initscripts/init.d/net/red/update @@ -0,0 +1,121 @@ +#!/bin/sh +######################################################################## +# Begin $network_devices/red/update +# +# Description : Update red interface +# +# Authors : Michael Tremer - mitch@ipfire.org +# +# Version : 01.00 +# +# Notes : update the settings if red goes up or down +# +######################################################################## + +eval $(/usr/local/bin/readhash /var/ipfire/vpn/settings) +eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings) +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) +eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings) + +if [ ! -e /var/lock/red.lock ]; then + touch /var/lock/red.lock + logger -p local0.info -t red[$$] "$0 locking for $$" +else + count=0 + while [ ! $count = 5 ]; do + sleep 3 + if [ ! -e /var/lock/red.lock ]; then + break + else + /usr/bin/logger -p local0.info -t red[$$] "$0 $$ waiting unlock" + fi + ((++count)) + done +fi + +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'` +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 + +### Restart DNSMASQ +killall -KILL dnsmasq 2> /dev/null +sleep 1 +ARGS="" +[ "$DOMAIN_NAME_GREEN" ] && ARGS="-s $DOMAIN_NAME_GREEN" +if [ -e "/var/ipfire/red/dial-on-demand" -a "$DIALONDEMANDDNS" == "on" -a ! -e "/var/ipfire/red/active" ]; then + /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS -r /var/ipfire/ppp/fake-resolv.conf +else + /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS -r /var/ipfire/red/resolv.conf +fi +unset ARGS + +### Reset default route to ippp0 for dial on demand +if [ -e "/var/ipfire/red/dial-on-demand" -a "$TYPE" == "isdn" -a ! -e "/var/ipfire/red/active" ]; then + ip route del default 2> /dev/null + if [ ! -z "$REMOTE" ]; then + ip route add default gw $REMOTE 2> /dev/null + else + ip route add default dev ippp0 2> /dev/null + fi +fi + +if ( echo $0 | /bin/grep -q 'dhcpcd.exe' ); then + eval $(/usr/local/bin/readhash "$1") + case "$2" in + up) + logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with old IP=${IPADDR}" + if [ "$RED_TYPE" != 'PPTP' ]; then + touch /var/ipfire/red/active + fi + ;; + new) + logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with new IP=${IPADDR}" + if [ -e "/var/ipfire/red/active" ]; then + /usr/local/bin/setfilters + /usr/local/bin/setportfw + /usr/local/bin/setxtaccess + /usr/local/bin/setddns.pl -f + /usr/local/bin/restartsnort red + sleep $VPN_DELAYED_START && /usr/local/bin/ipsecctrl S & + /bin/rm -f /var/lock/red.lock + logger -p local0.info -t red[$$] "unlocking from $$" + exit 0 + else + if [ "$RED_TYPE" != 'PPTP' ]; then + touch /var/ipfire/red/active + fi + fi + ;; + down) + logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been brought down" + rm -f /var/ipfire/red/active + ;; + esac +fi + +if [ -e "/var/ipfire/red/active" ]; then + [ "$IFACE" != "" ] && ifconfig $IFACE -multicast + /etc/rc.d/init.d/firewall reload + /usr/local/bin/setfilters + /usr/local/bin/restartsnort red + /usr/local/bin/qosctrl start + /usr/local/bin/setportfw + /usr/local/bin/setxtaccess + /usr/local/bin/setddns.pl -f + /etc/rc.d/helper/writeipac.pl + /usr/sbin/fetchipac -S + sleep $VPN_DELAYED_START && /usr/local/bin/ipsecctrl S & +else + /usr/local/bin/ipsecctrl D + /etc/rc.d/init.d/firewall reload +fi +/bin/rm -f /var/lock/red.lock +/usr/bin/logger -p local0.info -t red[$$] "unlocking from $$" + +# End $network_devices/red/update diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index 6823826d72..a891de2630 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -14,10 +14,11 @@ . /etc/sysconfig/rc . ${rc_functions} -eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) +eval $(/usr/local/bin/readhash /var/ipfire/vpn/settings) eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings) +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings) -eval $(/usr/local/bin/readhash /var/ipfire/vpn/settings) + case "${1}" in start) @@ -73,9 +74,22 @@ case "${1}" in name=orange /etc/rc.d/init.d/net/ifup fi + # Start DNSMASQ with defaults + killall -KILL dnsmasq 2> /dev/null + sleep 1 + if [ "$DOMAIN_NAME_GREEN" == "" ]; then + /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases + else + /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases -s "$DOMAIN_NAME_GREEN" + fi + # RED if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then - name=red /etc/rc.d/init.d/net/ifup + if [ "$AUTOCONNECT" == "off" ]; then + echo -n # Do anything + else + name=red /etc/rc.d/init.d/net/ifup + fi fi ;; diff --git a/src/initscripts/init.d/winbind b/src/initscripts/init.d/winbind new file mode 100644 index 0000000000..590fddf408 --- /dev/null +++ b/src/initscripts/init.d/winbind @@ -0,0 +1,50 @@ +#!/bin/bash +# Begin $rc_base/init.d/winbind + +# Based on sysklogd script from LFS-3.1 and earlier. +# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org + +#$LastChangedBy: bdubbs $ +#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ + +. /etc/sysconfig/rc +. $rc_functions + +PIDFILE="/var/run/winbindd.pid" +KILLDELAY="10" + +case "$1" in + + start) + boot_mesg "Starting winbind..." + loadproc /usr/sbin/winbindd + ;; + + stop) + boot_mesg "Stopping winbind..." + killproc -p ${PIDFILE} /usr/sbin/winbind + ;; + + reload) + boot_mesg "Reloading winbind..." + reloadproc /usr/sbin/winbindd + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /usr/sbin/winbindd + ;; + + *) + echo "Usage: $0 {start|stop|reload|restart|status}" + exit 1 + ;; + +esac + +# End $rc_base/init.d/winbind diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch new file mode 100755 index 0000000000..c007f5eebc --- /dev/null +++ b/src/scripts/vpn-watch @@ -0,0 +1,171 @@ +#!/bin/sh +# +# IPFire script - vpn-watch +# +# This code is distributed under the terms of the GPL +# +# (c) Daniel Berlin - Check for +# remote peer with dynamic IPs and restart when change +# is detected. Works with DPD which is not perfect! +# +# 2006: Franck - adapted original script to fit in IPCop 1.4 +# 2007: Michael Tremer - mitch@ipfire.org - Merged into IPFire +# +# 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +# +# Configuration +# + +VPN_CONFIG='/var/ipfire/vpn/config' # Location of IPFire's vpn configuration file +SETTINGS='/var/ipfire/vpn/settings' # and settings + +CHECK_INTERVAL='60' # Check this often (in seconds) +DNS_RESOLVE_TRIES='4' # Try to resolve IPs this often (each try takes max. 2 seconds) +NICENESS='+5' # Adjust niceness of child processes: '-20' ... '+19'; '0' is default +case "$1" in + 'start' | '--start') + eval $(/usr/local/bin/readhash $SETTINGS) + test "${VPN_WATCH}" != "on" && exit 1 # not activated, cannot start! + + if test ! -r "$VPN_CONFIG"; then + echo 'Error: cannot read IPFire VPN configuration file; exit.' >&2 + exit 1 + fi + + if /bin/test -p /var/run/$(basename $0); then + if ps --no-heading axw | grep -v 'grep' | grep -q "$(basename $0) conn: "; then + echo "Error: use '$(basename $0) stop' please; exit." >&2 + exit 1 + else + rm /var/run/$(basename $0) # pipe was left alone, correct error condition + fi + fi + + # the pipe serves for "-status" but is not used yet + /bin/mknod -m 0660 "/var/run/$(basename $0)" p >/dev/null 2>&1 # Create pipe for status-information + + # + # Read VPN configuration and fork a child process for each VPN connection active, net-to-net & RED + # + while read line; do + VPN=($(echo $line | cut --delimiter=',' --output-delimiter=' ' -f2,3,5,12,28 )) # Activated, Name, Host/Net-to-net, Remote, ITF. + test "${VPN[0]}" != "on" && continue # Ignore: deactivated connections + test "${VPN[2]}" = "host" && continue # Ignore: roadwarriors + ## test "${VPN[4]}" != "RED" && continue # Ignore: local vpns needed or not ? + echo -n "${VPN[3]}" | grep -q '^[[:digit:]\.]\+$' && continue #If fixed remote IP, no need to watch! + $0 'conn:' "${VPN[1]}" "${VPN[3]}">/dev/null 2>&1 & #Fork child process (parameters: "conn: NAME RIGHT") + done < "$VPN_CONFIG" + exit 0 # Parent dies here... RIP + ;; + + 'stop' | '--stop') + # Terminate processes + for proc in $(pidof -x -o %PPID $(basename $0)); do + kill -s SIGTERM -- "$proc" + done + sleep 1 + + # Kill remaining processes + for proc in $(/bin/pidof -x -o %PPID $(basename $0)); do + kill -s SIGKILL -- "$proc" + done + rm -f "/var/run/$(basename $0)" # Remove pipe + exit 0 + ;; + + #'status' | '--status') + # echo "VPN-Watch" + # if ps --no-heading axw | grep -v 'grep' | grep -q "$(basename $0) conn: "; then + # trap '' USR1 + # killall -q -g -s USR1 -- $(basename $0) + # sleep 1 + # cat "/var/run/$(basename $0)" | sort # Read children's info from pipe + # else + # echo ' no instance running.' + # fi + # exit 0 + # ;; + + 'conn:') + # Children proceed here... + renice ${NICENESS:-0} -p $$ >/dev/null 2>&1 # Adjust niceness + shift # Remove the first positional parameter ("conn:"), as we don't need it anymore + ;; + *) + /bin/echo "Usage: $0 { start | stop }" >&2 + exit 1 + ;; +esac + +# Logging, signal handlers +alias log="logger -t vpn-watch \'${1}\':" + +trap 'log "terminated after ${RESTART_COUNT} restarts."' EXIT +#trap 'echo "connection \"${1}\" restarted ${RESTART_COUNT} times" >>/var/run/$(basename $0)' USR1 + +# +# Get IP of a FQDN... using 'host' command. Everything is ok when dns server responds. +# If no response, +# -maybe RED is down. The script can terminate. It will restart with rc.updatered. +# or +# -the dns server is down. In this case, terminate the script is not a good idea... +# Thus 4 retries before returning response 'stop' +# +function get_ip () { + local RESULT='' + # delay divided by two for each loop + delay=8 + for ((i=1; ${i} <= ${DNS_RESOLVE_TRIES}; i++)); do + + # extract IP address + RESULT=$(/usr/bin/host "$1" 2>/dev/null| awk '{ print $4 }') + if echo -n $RESULT | /bin/grep -q '^[[:digit:]\.]\+$' ; then + echo -n $RESULT + return + fi + + sleep $delay + delay=$((delay>>1)) + done + # Change 'stop' to something else to let the script running + echo -n "stop" # stop: the script will terminate + +} + +# Infinite loop; checks, whether the IP of FQDN has changed. +# If so, the affected connection gets restarted. +# +RESTART_COUNT=0 +REMOTE_IP_OLD=$(get_ip $2) +log "start watching $REMOTE_IP_OLD" + +while [ $REMOTE_IP_OLD != 'stop' ] ; do + sleep $CHECK_INTERVAL + # Skip check until IPSec is running. Update IP_OLD while our ipsec is down + /usr/sbin/ipsec auto --status >/dev/null 2>&1 || { + REMOTE_IP_OLD=$(get_ip $2) + continue + } + + REMOTE_IP_NEW=$(get_ip $2) + + if test "${REMOTE_IP_OLD}" != "${REMOTE_IP_NEW}"; then + /usr/sbin/ipsec auto --down $1 + /usr/sbin/ipsec auto --replace $1 + /usr/sbin/ipsec auto --rereadsecrets + /usr/sbin/ipsec auto --up $1 + let RESTART_COUNT++ + log "Remote IP has changed from $REMOTE_IP_OLD to $REMOTE_IP_NEW. Connection restarted (#$RESTART_COUNT times)." + REMOTE_IP_OLD=$REMOTE_IP_NEW + fi +done diff --git a/tools/check_strings.pl b/tools/check_strings.pl index 4d5650ca85..655b377aa3 100644 --- a/tools/check_strings.pl +++ b/tools/check_strings.pl @@ -50,6 +50,7 @@ sub wanted { find (\&wanted, "$basedir/html" ); find (\&wanted, "$basedir/src/scripts" ); find (\&wanted, "$basedir/config/cfgroot" ); +find (\&wanted, "$basedir/config/menu" ); for my $key ( sort (keys %tr) ) { my $value = $tr{$key}; -- 2.39.2