Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files
index cdf4b3e03347cb908c5e4448c7ece743232c2d58..956e06e572fd21780640fc058d8417747bb09e89 100644 (file)
--- a/config/rootfiles/core/46/filelists/files
+++ b/config/rootfiles/core/46/filelists/files
@@ -2,3 +2,10 @@ etc/system-release
 boot/ipfirerd-2.6.32.28.img
 opt/pakfire/lib/functions.pl
 var/ipfire/backup/include
+srv/web/ipfire/cgi-bin/system.cgi
+srv/web/ipfire/cgi-bin/ddns.cgi
+usr/local/bin/setddns.pl
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl
+var/ipfire/langs/es.pl
+var/ipfire/langs/fr.pl

diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh
index fd52ac7310c971c117bef25fe88cd6d36f905aa9..7416512449c05c04defe5c7a0992bddfc472c4da 100644 (file)
--- a/config/rootfiles/core/46/update.sh
+++ b/config/rootfiles/core/46/update.sh
@@ -40,7 +40,7 @@ extract_files
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 # Rebuild initrd of optional pae and xen kernel
 KVER=2.6.32.28

diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 4dba22f535a058949936ce7f83c9b7c77d4da879..2912b44217ffb1dde52a9cd3ec1ea9737e92f218 100644 (file)
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # 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        #
@@ -249,6 +249,7 @@ $checked{'SERVICE'}{'nsupdate'} = '';
 $checked{'SERVICE'}{'ovh.com'} = '';
 $checked{'SERVICE'}{'regfish.com'} = '';
 $checked{'SERVICE'}{'selfhost.de'} = '';
+$checked{'SERVICE'}{'strato.com'} = '';
 $checked{'SERVICE'}{'tzo.com'} = '';
 $checked{'SERVICE'}{'zoneedit.com'} = '';
 $checked{'SERVICE'}{$settings{'SERVICE'}} = "selected='selected'";
@@ -342,6 +343,7 @@ print <<END
     <option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option>
     <option $checked{'SERVICE'}{'regfish.com'}>regfish.com</option>
     <option $checked{'SERVICE'}{'selfhost.de'}>selfhost.de</option>
+    <option $checked{'SERVICE'}{'strato.com'}>strato.com</option>
 <!--    <option $checked{'SERVICE'}{'tzo.com'}>tzo.com</option>        comment this service out until a working fix is developed -->
     <option $checked{'SERVICE'}{'zoneedit.com'}>zoneedit.com</option>
     </select></td>

diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
index 4b8ee47e69a4ec3e42e03fe7d4ffc46879913af3..a0e7655ab95e1b62aec711eb501b68f626f3fa4c 100644 (file)
--- a/html/cgi-bin/system.cgi
+++ b/html/cgi-bin/system.cgi
@@ -56,16 +56,16 @@ if ( $querry[0] =~ "cpufreq"){
        &Header::openpage($Lang::tr{'status information'}, 1, '');
        &Header::openbigbox('100%', 'left');
 
+       &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
+       &Graphs::makegraphbox("system.cgi","cpu","day","325");
+       &Header::closebox();
+
        if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
                &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
                &Graphs::makegraphbox("system.cgi","cpufreq","day","325");
                &Header::closebox();
        }
 
-       &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
-       &Graphs::makegraphbox("system.cgi","cpu","day","325");
-       &Header::closebox();
-
        &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
        &Graphs::makegraphbox("system.cgi","load","day");
        &Header::closebox();

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b4db1feee23336fac3fe5109718c62fc412489de..808092e2492d71fb67362b93a70a68e107e71c1b 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -18,6 +18,7 @@
 'ConnSched ipsecstart' => 'IPSec (neu)starten',
 'ConnSched ipsecstop' => 'IPSec stop',
 'ConnSched reconnect' => 'Neu verbinden',
+'cpu frequency per' => 'CPU Frequenz pro',
 'ConnSched scheduled actions' => 'Geplante Aktionen',
 'ConnSched scheduler' => 'Scheduler',
 'ConnSched select profile' => 'Wähle Profil',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a1d687d05fd25aa3401110f0c9d419de88f61f73..26349e1925a93f9b01422db16c5bcefe0f272ca3 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -17,6 +17,7 @@
 'ConnSched down' => 'Down',
 'ConnSched ipsecstart' => 'IPSec (re)start',
 'ConnSched ipsecstop' => 'IPSec stop',
+'cpu frequency per' => 'CPU frequency per',
 'ConnSched reconnect' => 'Reconnect',
 'ConnSched scheduled actions' => 'Scheduled actions',
 'ConnSched scheduler' => 'Scheduler',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index f5640cf538652572858a4ffed7afbc4f8599a569..cad4406acbf88ae2469e337a5776182a8c0b552b 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -535,6 +535,7 @@
 'cpu idle usage' => 'Uso de CPU inactivo',
 'cpu interrupt usage' => 'Uso de interrupción de CPU',
 'cpu iowait usage' => 'CPU esperando IO',
+'cpu frequency per' => 'CPU frecuencia por',
 'cpu irq usage' => 'Uso de IRQ del CPU',
 'cpu nice usage' => 'Buen uso de CPU',
 'cpu steal usage' => 'uso de CPU steal',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 6ccb4d507c3a70697e081999e609976a6fcc9360..eb81c5227e39525a57df662272cdb9fd9e3e4b53 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -16,6 +16,7 @@
 'ConnSched days' => 'Jours :',
 'ConnSched down' => 'Arrêt',
 'ConnSched ipsecstart' => 'IPSec (re)démarrage',
+'cpu frequency per' => 'CPU fréquence par',
 'ConnSched ipsecstop' => 'IPSec arrêt',
 'ConnSched reconnect' => 'Reconnecter',
 'ConnSched scheduled actions' => 'Actions planifiées',

diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl
index beb9af8b884ee7d530cb7a6cdf28992384ee9f5c..a71590402d3575b99df2c06f6d6bb905ff970755 100644 (file)
--- a/src/scripts/setddns.pl
+++ b/src/scripts/setddns.pl
@@ -390,7 +390,7 @@ if ($ip ne $ipcache) {
                                &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)");
                            }
                        }
-                       elsif ($settings{'SERVICE'} eq 'regfish') {
+                       elsif ($settings{'SERVICE'} eq 'strato') {
                                # use proxy ?
                                my %proxysettings;
                                &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
@@ -398,25 +398,62 @@ if ($ip ne $ipcache) {
                                        my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
                                        Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
                                }
-                               my ($out, $response) = Net::SSLeay::get_https(  'dyndns.regfish.de',
-                                                                               443,
-                                                                               "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}",
-                                                                               Net::SSLeay::make_headers('User-Agent' => 'Ipfire' )
-                                                                               );
-                               #Valid responses from service are:
-                               # success|100|update succeeded!
-                               # success|101|no update needed at this time..
+
+                               if ($settings{'HOSTNAME'} eq '') {
+                                       $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'};
+                               } else {
+                                       $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}";
+                               }
+
+                               my ($out, $response) = Net::SSLeay::get_https(  'dyndns.strato.com',
+                                                                           443,
+                                                                           "/nic/update?hostname=$settings{'HOSTDOMAIN'}&myip=$ip",
+                                                                           Net::SSLeay::make_headers('User-Agent' => 'IPFire',
+                                                                            'Authorization' => 'Basic ' . encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}") )
+                                                                        );
+
                                if ($response =~ m%HTTP/1\.. 200 OK%) {
-                                       if ( $out !~ m/(success\|(100|101)\|)/ig ) {
-                                               &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)");
+                                       #Valid responses from update => ErrCount=0
+                                       if ( $out =~ m/good |nochg /ig) {
+                                               &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : success");
+                                               $success++;
                                        } else {
-                                               &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success");
+                                               &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure1 ($out)");
                                                $success++;
                                        }
+                               } elsif ( $out =~ m/<title>(.*)<\/title>/ig ) {
+                                       &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure2 ($1)");
                                } else {
-                                       &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)");
+                                       &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure3 ($response)");
                                }
                        }
+                       elsif ($settings{'SERVICE'} eq 'regfish') {
+                           # use proxy ?
+                           my %proxysettings;
+                           &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
+                           if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
+                               my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
+                               Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
+                           }
+                                       my ($out, $response) = Net::SSLeay::get_https(  'dyndns.regfish.de',
+                                                                               443,
+                                                                               "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}",
+                                                                               Net::SSLeay::make_headers('User-Agent' => 'Ipfire' )
+                                                                               );
+                           #Valid responses from service are:
+                           #success|100|update succeeded!
+                           #success|101|no update needed at this time..
+                           if ($response =~ m%HTTP/1\.. 200 OK%) {
+                               if ( $out !~ m/(success\|(100|101)\|)/ig ) {
+                                   &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)");
+                               } else {
+                                   &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success");
+                                   $success++;
+                               }
+                           } else {
+                               &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)");
+                           }
+                       }
                        elsif ($settings{'SERVICE'} eq 'ovh') {
                                my %proxysettings;
                                &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);