This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, core80 has been updated via e351c1e0905deea4fc65646952b7c621ebdb1c14 (commit) via e611222f41922419819e9cbe3e2f1e66d5000543 (commit) via 44dcf6349809c2e5c77d4cb4cdfe465620dce737 (commit) from d7636b6fa3462eb3437fd2d18e88916962a04056 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e351c1e0905deea4fc65646952b7c621ebdb1c14 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jul 13 13:07:00 2014 +0200
ddns: don't use forced update.
commit e611222f41922419819e9cbe3e2f1e66d5000543 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jul 13 12:46:41 2014 +0200
ddns.cgi: fix convert at update.
commit 44dcf6349809c2e5c77d4cb4cdfe465620dce737 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 13 10:13:21 2014 +0200
core80: Add ddns to updater.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/80/filelists/ddns | 1 + config/rootfiles/core/80/filelists/files | 2 ++ config/rootfiles/core/80/update.sh | 2 ++ html/cgi-bin/ddns.cgi | 20 ++++++++++---------- src/initscripts/init.d/networking/red.up/30-ddns | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) create mode 120000 config/rootfiles/core/80/filelists/ddns
Difference in files: diff --git a/config/rootfiles/core/80/filelists/ddns b/config/rootfiles/core/80/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/core/80/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files index e59252b..8ece4f8 100644 --- a/config/rootfiles/core/80/filelists/files +++ b/config/rootfiles/core/80/filelists/files @@ -3,6 +3,8 @@ etc/issue etc/logrotate.conf etc/rc.d/init.d/dhcrelay etc/rc.d/init.d/dnsmasq +etc/rc.d/init.d/networking/red.up/30-ddns +srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/routing.cgi diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh index 27e5bde..baba3e2 100644 --- a/config/rootfiles/core/80/update.sh +++ b/config/rootfiles/core/80/update.sh @@ -40,6 +40,8 @@ rm -f \ /usr/lib/ipsec/plugins/libstrongswan-unity.so \ /usr/share/strongswan/templates/config/plugins/unity.conf
+rm -f /usr/local/bin/setddns.pl + # Extract files extract_files
diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 738e6ec..6bee9c6 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -29,12 +29,6 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl";
-# Hook to regenerate the configuration files, if cgi got called from command line. -if ($ENV{"REMOTE_ADDR"} eq "") { - &GenerateDDNSConfigFile(); - exit(0); -} - #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::table2colour}, ${Header::colouryellow} ); undef (@dummy); @@ -53,7 +47,7 @@ my $datafile = "${General::swroot}/ddns/config"; # Dynamic ddns programm call. my @ddnsprog = ("/usr/bin/ddns", "--config", "/var/ipfire/ddns/ddns.conf", - "update-all", "--force" ); + "update-all");
my %settings=(); my $errormessage = ''; @@ -72,6 +66,15 @@ $settings{'SERVICE'} = '';
$settings{'ACTION'} = '';
+# Get supported ddns providers. +my @providers = &GetProviders(); + +# Hook to regenerate the configuration files, if cgi got called from command line. +if ($ENV{"REMOTE_ADDR"} eq "") { + &GenerateDDNSConfigFile(); + exit(0); +} + &Header::showhttpheaders();
#Get GUI values @@ -82,9 +85,6 @@ open(FILE, "$datafile") or die "Unable to open $datafile."; my @current = <FILE>; close (FILE);
-# Get supported ddns providers. -my @providers = &GetProviders(); - # # Save General Settings. # diff --git a/src/initscripts/init.d/networking/red.up/30-ddns b/src/initscripts/init.d/networking/red.up/30-ddns index 6eba04b..591dd0f 100644 --- a/src/initscripts/init.d/networking/red.up/30-ddns +++ b/src/initscripts/init.d/networking/red.up/30-ddns @@ -1,3 +1,3 @@ #!/bin/bash
-exec /usr/bin/ddns update-all --force +exec /usr/bin/ddns update-all
hooks/post-receive -- IPFire 2.x development tree