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, master has been updated via 579a39d0ba66b05767eacef0841e61b715429f20 (commit) from e07587fc5936abd1b33dbd4236f13d89e3640c63 (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 579a39d0ba66b05767eacef0841e61b715429f20 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 27 15:44:24 2010 +0100

Add webinterface frontend for fireinfo.

-----------------------------------------------------------------------

Summary of changes: config/menu/10-system.menu | 6 + config/rootfiles/common/apache2 | 1 + config/rootfiles/common/initscripts | 2 + config/rootfiles/core/44/filelists/files | 3 + doc/language_issues.de | 2 - doc/language_issues.en | 2 - doc/language_issues.es | 19 +++- doc/language_issues.fr | 17 +++- doc/language_missings | 30 ++++++ html/cgi-bin/credits.cgi | 7 -- html/cgi-bin/fireinfo.cgi | 168 ++++++++++++++++++++++++++++++ html/cgi-bin/index.cgi | 6 +- langs/de/cgi-bin/de.pl | 16 +++- langs/en/cgi-bin/en.pl | 16 +++- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- lfs/initscripts | 1 + src/initscripts/init.d/fireinfo | 32 ++++++ 18 files changed, 312 insertions(+), 20 deletions(-) create mode 100644 html/cgi-bin/fireinfo.cgi create mode 100755 src/initscripts/init.d/fireinfo

Difference in files: diff --git a/config/menu/10-system.menu b/config/menu/10-system.menu index 692f133..9248663 100644 --- a/config/menu/10-system.menu +++ b/config/menu/10-system.menu @@ -28,6 +28,12 @@ 'title' => "$Lang::tr{'backup'}", 'enabled' => 1, }; + $subsystem->{'41.fireinfo'} = { + 'caption' => $Lang::tr{'system information'}, + 'uri' => '/cgi-bin/fireinfo.cgi', + 'title' => "$Lang::tr{'system information'}", + 'enabled' => 1, + }; $subsystem->{'99.credits'} = { 'caption' => $Lang::tr{'credits'}, 'uri' => '/cgi-bin/credits.cgi', diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 3d041c5..c7262a5 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1323,6 +1323,7 @@ srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/dmzholes.cgi srv/web/ipfire/cgi-bin/extrahd.cgi +srv/web/ipfire/cgi-bin/fireinfo.cgi srv/web/ipfire/cgi-bin/gui.cgi srv/web/ipfire/cgi-bin/hardwaregraphs.cgi srv/web/ipfire/cgi-bin/hosts.cgi diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 3bd4142..7a860a8 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -27,6 +27,7 @@ etc/rc.d/init.d/dhcp etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/fcron #etc/rc.d/init.d/fetchmail +etc/rc.d/init.d/fireinfo etc/rc.d/init.d/firewall etc/rc.d/init.d/firstsetup etc/rc.d/init.d/functions @@ -211,6 +212,7 @@ etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S90sysctl +etc/rc.d/rcsysinit.d/S99fireinfo #etc/sysconfig etc/sysconfig/createfiles etc/sysconfig/firewall.local diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files index f41dd5d..09eb184 100644 --- a/config/rootfiles/core/44/filelists/files +++ b/config/rootfiles/core/44/filelists/files @@ -7,6 +7,8 @@ etc/rc.d/init.d/squid etc/rc.d/init.d/networking/dhcpcd.exe etc/rc.d/init.d/networking/red etc/rc.d/init.d/networking/red.up/99-fireinfo +etc/rc.d/rcsysinit.d/S99fireinfo +srv/web/ipfire/cgi-bin/fireinfo.cgi srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/index.cgi @@ -35,6 +37,7 @@ var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/fr.pl var/ipfire/langs/es.pl +var/ipfire/menu.d/10-system.menu usr/local/bin/timectrl usr/local/bin/rebuild-initrd usr/local/bin/scanhd diff --git a/doc/language_issues.de b/doc/language_issues.de index 75205b4..a482dce 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -230,7 +230,6 @@ WARNING: translation string unused: max outgoing size WARNING: translation string unused: max size WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs -WARNING: translation string unused: mbmon temp WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value WARNING: translation string unused: min size @@ -463,4 +462,3 @@ WARNING: untranslated string: cpu frequency per WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: qos add subclass -WARNING: untranslated string: sensors temp diff --git a/doc/language_issues.en b/doc/language_issues.en index bbde5bc..c95749b 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -257,7 +257,6 @@ WARNING: translation string unused: max outgoing size WARNING: translation string unused: max size WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs -WARNING: translation string unused: mbmon temp WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value WARNING: translation string unused: min size @@ -495,4 +494,3 @@ WARNING: untranslated string: bytes WARNING: untranslated string: cpu frequency per WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname -WARNING: untranslated string: sensors temp diff --git a/doc/language_issues.es b/doc/language_issues.es index 345e847..a91996d 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -257,7 +257,6 @@ WARNING: translation string unused: max outgoing size WARNING: translation string unused: max size WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs -WARNING: translation string unused: mbmon temp WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value WARNING: translation string unused: min size @@ -496,9 +495,24 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot WARNING: untranslated string: bytes WARNING: untranslated string: cpu frequency per +WARNING: untranslated string: fireinfo ipfire version +WARNING: untranslated string: fireinfo is disabled +WARNING: untranslated string: fireinfo is enabled +WARNING: untranslated string: fireinfo is submitted +WARNING: untranslated string: fireinfo is submitted button +WARNING: untranslated string: fireinfo kernel version +WARNING: untranslated string: fireinfo not submitted +WARNING: untranslated string: fireinfo not submitted button +WARNING: untranslated string: fireinfo pakfire version +WARNING: untranslated string: fireinfo please enable +WARNING: untranslated string: fireinfo settings +WARNING: untranslated string: fireinfo system version +WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group +WARNING: untranslated string: outgoing firewall edit ip group +WARNING: untranslated string: outgoing firewall edit mac group WARNING: untranslated string: outgoing firewall group error WARNING: untranslated string: outgoing firewall groups WARNING: untranslated string: outgoing firewall ip groups @@ -510,4 +524,5 @@ WARNING: untranslated string: outgoing firewall p2p description 2 WARNING: untranslated string: outgoing firewall p2p description 3 WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing firewall view group -WARNING: untranslated string: sensors temp +WARNING: untranslated string: pakfire ago +WARNING: untranslated string: system information diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 76ea06e..8107ab9 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -258,7 +258,6 @@ WARNING: translation string unused: max outgoing size WARNING: translation string unused: max size WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs -WARNING: translation string unused: mbmon temp WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value WARNING: translation string unused: min size @@ -498,12 +497,26 @@ WARNING: untranslated string: bytes WARNING: untranslated string: cpu frequency per WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: extrahd detected drives +WARNING: untranslated string: fireinfo ipfire version +WARNING: untranslated string: fireinfo is disabled +WARNING: untranslated string: fireinfo is enabled +WARNING: untranslated string: fireinfo is submitted +WARNING: untranslated string: fireinfo is submitted button +WARNING: untranslated string: fireinfo kernel version +WARNING: untranslated string: fireinfo not submitted +WARNING: untranslated string: fireinfo not submitted button +WARNING: untranslated string: fireinfo pakfire version +WARNING: untranslated string: fireinfo please enable +WARNING: untranslated string: fireinfo settings +WARNING: untranslated string: fireinfo system version +WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: new WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync WARNING: untranslated string: outgoing firewall reserved groupname -WARNING: untranslated string: sensors temp +WARNING: untranslated string: pakfire ago WARNING: untranslated string: snort working +WARNING: untranslated string: system information WARNING: untranslated string: upload new ruleset WARNING: untranslated string: urlfilter file ext block WARNING: untranslated string: urlfilter mode block diff --git a/doc/language_missings b/doc/language_missings index ababc79..e72d7d6 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -12,9 +12,23 @@ ############################################################################ < dns address deleted txt < extrahd detected drives +< fireinfo ipfire version +< fireinfo is disabled +< fireinfo is enabled +< fireinfo is submitted +< fireinfo is submitted button +< fireinfo kernel version +< fireinfo not submitted +< fireinfo not submitted button +< fireinfo pakfire version +< fireinfo please enable +< fireinfo settings +< fireinfo system version +< fireinfo your profile id < ntp common settings < ntp sync < snort working +< system information < upload new ruleset < urlfilter file ext block < urlfilter mode block @@ -45,8 +59,23 @@ # Checking cgi-bin translations for language: es # ############################################################################ < Async logging enabled +< fireinfo ipfire version +< fireinfo is disabled +< fireinfo is enabled +< fireinfo is submitted +< fireinfo is submitted button +< fireinfo kernel version +< fireinfo not submitted +< fireinfo not submitted button +< fireinfo pakfire version +< fireinfo please enable +< fireinfo settings +< fireinfo system version +< fireinfo your profile id < outgoing firewall add ip group < outgoing firewall add mac group +< outgoing firewall edit ip group +< outgoing firewall edit mac group < outgoing firewall group error < outgoing firewall groups < outgoing firewall ip groups @@ -58,3 +87,4 @@ < outgoing firewall p2p description 3 < outgoing firewall view group < Set time on boot +< system information diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index ff56efa..60b5b90 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -35,13 +35,6 @@ require "${General::swroot}/header.pl";

&Header::openbigbox('100%', 'center');

-&Header::openbox('100%', 'left', 'Version'); -print "This is ".`cat /etc/system-release`; -print " - Pakfire ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\" -f2`; -print "<br />".`uname -a`; -print "<br /><br /><br /><br />"; -&Header::closebox(); - &Header::openbox('100%', 'left', $Lang::tr{'donation'});

print <<END diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi new file mode 100644 index 0000000..4b97252 --- /dev/null +++ b/html/cgi-bin/fireinfo.cgi @@ -0,0 +1,168 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 3 of the License, 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. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +use strict; + +# enable only the following on debugging purpose +use warnings; +use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; + +my $configfile = "/var/ipfire/main/send_profile"; + +my %fireinfosettings=(); +my $errormessage=''; + +&Header::showhttpheaders(); + +$fireinfosettings{'ENABLE_FIREINFO'} = 'off'; +$fireinfosettings{'ACTION'} = ''; + +&Header::getcgihash(%fireinfosettings); + +if ( -e "$configfile" ) { + $fireinfosettings{'ENABLE_FIREINFO'} = 'on'; +} + +if ("$fireinfosettings{'ACTION'}" eq "trigger") { + if ($fireinfosettings{'ENABLE_FIREINFO'} eq 'off') { + &General::log($Lang::tr{'fireinfo is enabled'}); + system ('/usr/bin/touch', $configfile); + $fireinfosettings{'ENABLE_FIREINFO'} = 'on'; + } else { + &General::log($Lang::tr{'fireinfo is disabled'}); + unlink "$configfile"; + $fireinfosettings{'ENABLE_FIREINFO'} = 'off'; + } +} + +&Header::openpage('Fireinfo', 1, ''); + +if ($fireinfosettings{'ENABLE_FIREINFO'} ne "on") { + &Header::openbox("100%", "left", "Why should I enable fireinfo?"); + + print <<END; +<font color="$Header::colourred"> + <p> + It is very important for the development of IPFire that you enable this + service. <a href="http://fireinfo.ipfire.org" target="_blank">Read more about the reasons.</a> + </p> +</font> +END + + &Header::closebox(); +} + +&Header::openbigbox('100%', 'left', '', $errormessage); + +if ($errormessage) { + &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}"); + print "<FONT CLASS='base'>$errormessage&nbsp;</FONT>\n"; + &Header::closebox(); +} + +my $ipfire_version = `cat /etc/system-release`; +my $pakfire_version = `cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\" -f2`; +my $kernel_version = `uname -a`; + +&Header::openbox('100%', 'left', $Lang::tr{'fireinfo system version'}); +print <<END; + <table width="100%"> + <tr> + <td>$Lang::tr{'fireinfo ipfire version'}:</td> + <td>$ipfire_version</td> + </tr> + <tr> + <td>$Lang::tr{'fireinfo pakfire version'}:</td> + <td>$pakfire_version</td> + </tr> + <tr> + <td>$Lang::tr{'fireinfo kernel version'}:</td> + <td>$kernel_version</td> + </tr> + </table> +END +&Header::closebox(); + +# Read pregenerated profile data +my $profile = `cat /var/ipfire/fireinfo/profile`; + +print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n"; + +# Read profile ID from file +my $profile_id = `cat /var/ipfire/fireinfo/public_id`; +chomp($profile_id); + +&Header::openbox('100%', 'left', $Lang::tr{'fireinfo settings'}); +print <<END; +<input type='hidden' name='ACTION' value='trigger' /> +<table width='100%'> + <tr> + <td>$Lang::tr{'fireinfo your profile id'}:</td> + <td> + <a href="http://fireinfo.ipfire.org/profile/$profile_id" target="_blank">$profile_id</a> + </td> + </tr> + <tr> + <!-- spacer --> + <td colspan="2">&nbsp;</td> + </tr> + <tr> + <td class='base'> +END + +if ($fireinfosettings{'ENABLE_FIREINFO'} eq "on") { + print "<font color='$Header::colourgreen'>$Lang::tr{'fireinfo is submitted'}</font>"; +} else { + print "<font color='$Header::colourred'>$Lang::tr{'fireinfo not submitted'}</font>"; +} + +print "</td><td>"; + +if ($fireinfosettings{'ENABLE_FIREINFO'} eq "on") { + print "<input type='submit' name='submit' value="$Lang::tr{'fireinfo is submitted button'}" />"; +} else { + print "<input type='submit' name='submit' value="$Lang::tr{'fireinfo not submitted button'}" />"; +} + +print <<END; + </td> + </tr> + <tr> + <!-- spacer --> + <td colspan="2">&nbsp;</td> + </tr> + <tr> + <td colspan='2'> + <textarea rows="25" cols="75" readonly="true">$profile</textarea> + </td> + </tr> +</table> +END +; +&Header::closebox(); +print "</form>\n"; + +&Header::closebigbox(); +&Header::closepage(); diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 268ab7e..6a93b68 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -388,6 +388,11 @@ END END }

+# Fireinfo +if ( ! -e "/var/ipfire/main/send_profile") { + $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>"; +} + # Memory usage warning my @free = `/usr/bin/free`; $free[1] =~ m/(\d+)/; @@ -436,7 +441,6 @@ foreach my $file (@files) { } }

- if ($warnmessage) { print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>"; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 35650da..dca8f44 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -781,6 +781,19 @@ 'fetch ip from' => 'Schätze die echte öffentliche IP-Adresse mit Hilfe eines externen Servers', 'filename' => 'Dateiname', 'filesystem full' => 'Dateisystem voll', +'fireinfo ipfire version' => 'IPFire-Version', +'fireinfo is disabled' => 'Fireinfo ist ausgeschaltet', +'fireinfo is enabled' => 'Fireinfo ist eingeschaltet', +'fireinfo is submitted' => 'Der Dienst ist eingeschaltet.', +'fireinfo is submitted button' => 'Nein, ich möchte mein Profil nicht mehr veröffentlichen', +'fireinfo kernel version' => 'Kernel-Version', +'fireinfo not submitted' => 'Der Dienst ist ausgeschaltet.', +'fireinfo not submitted button' => 'Ja, ich möchte mein Profil veröffentlichen', +'fireinfo pakfire version' => 'Pakfire-Version', +'fireinfo please enable' => 'Bitte schalten Sie den Fireinfo-Dienst ein.', +'fireinfo settings' => 'Fireinfo-Einstellungen', +'fireinfo system version' => 'Systemversionen', +'fireinfo your profile id' => 'Profil-ID', 'firewall' => 'Firewall', 'firewall graphs' => 'Firewall Diagramme', 'firewall hits' => 'Gesamtanzahl der Firewall-Treffer für', @@ -831,8 +844,8 @@ 'genkey' => 'PSK erzeugen', 'genre' => 'Genre', 'global settings' => 'Globale Einstellungen', -'gpl license agreement' => 'Lizenz Vereinbarung', 'gpl i accept these terms and conditions' => 'Ich akzeptiere diese Bedingungen und Konditionen', +'gpl license agreement' => 'Lizenz Vereinbarung', 'gpl please read carefully the general public license and accept it below' => 'Bitte die General Public License genau lesen und diese unten akzeptiere', 'gpl unofficial translation of the general public license v3' => 'Inoffizielle Übersetzung der General Public License v3', 'graph' => 'Diagramm', @@ -1641,6 +1654,7 @@ 'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro', 'system' => 'System', 'system graphs' => 'System-Diagramme', +'system information' => 'Systeminformationen', 'system log viewer' => 'Betrachter der System-Logdateien', 'system logs' => 'System-Logdateien', 'system status information' => 'System-Statusinformationen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8604433..ad16ec2 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -805,6 +805,19 @@ 'fetch ip from' => 'Guess the real public IP with help of an external server', 'filename' => 'Filename', 'filesystem full' => 'Filesystem full', +'fireinfo ipfire version' => 'IPFire version', +'fireinfo is disabled' => 'Fireinfo is disabled', +'fireinfo is enabled' => 'Fireinfo is enabled', +'fireinfo is submitted' => 'Your profile is submitted to the fireinfo service.', +'fireinfo is submitted button' => 'No, I do not want to send my profile anymore', +'fireinfo kernel version' => 'Kernel version', +'fireinfo not submitted' => 'Your profile is not submitted to the fireinfo service.', +'fireinfo not submitted button' => 'Yes, I want to send my profile', +'fireinfo pakfire version' => 'Pakfire version', +'fireinfo please enable' => 'Please enable the fireinfo service.', +'fireinfo settings' => 'Fireinfo settings', +'fireinfo system version' => 'System versions', +'fireinfo your profile id' => 'Your profile ID', 'firewall' => 'Firewall', 'firewall graphs' => 'Firewall Graphs', 'firewall hits' => 'Total number of firewall hits for', @@ -857,8 +870,8 @@ 'genkey' => 'Generate PSK', 'genre' => 'Genre', 'global settings' => 'Global settings', -'gpl license agreement' => 'License Agreement', 'gpl i accept these terms and conditions' => 'I accept these terms and conditions', +'gpl license agreement' => 'License Agreement', 'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below', 'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3', 'graph' => 'Graph', @@ -1674,6 +1687,7 @@ 'swap usage per' => 'Swap usage per', 'system' => 'System', 'system graphs' => 'System Graphs', +'system information' => 'System information', 'system log viewer' => 'System Log Viewer', 'system logs' => 'System Logs', 'system status information' => 'System Status Information', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 7ed5f54..f5640cf 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -855,8 +855,8 @@ 'genkey' => 'Generar PSK', 'genre' => 'Género', 'global settings' => 'Configuraciones globales', -'gpl license agreement' => 'License Agreement', 'gpl i accept these terms and conditions' => 'I accept these terms and conditions', +'gpl license agreement' => 'License Agreement', 'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below', 'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3', 'graph' => 'Gráfico', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 160bb1b..6ccb4d5 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -856,8 +856,8 @@ 'genkey' => 'Générer PSK', 'genre' => 'Genre', 'global settings' => 'Configuration générale', -'gpl license agreement' => 'License Agreement', 'gpl i accept these terms and conditions' => 'J'accepte les termes et les conditions', +'gpl license agreement' => 'License Agreement', 'gpl please read carefully the general public license and accept it below' => 'Merci de lire attentivement la Licence et de l'accepter', 'gpl unofficial translation of the general public license v3' => 'Traduction non officielle de la Licence v3', 'graph' => 'Graphique', diff --git a/lfs/initscripts b/lfs/initscripts index bc11ce2..0564f1e 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -172,6 +172,7 @@ $(TARGET) : ln -sf ../init.d/firstsetup /etc/rc.d/rcsysinit.d/S75firstsetup ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S90sysctl + ln -sf ../init.d/fireinfo /etc/rc.d/rcsysinit.d/S99fireinfo ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall diff --git a/src/initscripts/init.d/fireinfo b/src/initscripts/init.d/fireinfo new file mode 100755 index 0000000..bedf3a5 --- /dev/null +++ b/src/initscripts/init.d/fireinfo @@ -0,0 +1,32 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/fireinfo +# +# Description : Fireinfo profile generator +# +# Authors : IPFire Team +# +# Notes : This script saves the fireinfo profile to a file which +# is needed to show that information on the webinterface. +# No data is sent to the server. +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + mkdir -p /var/ipfire/fireinfo 2>/dev/null + + sendprofile --public-id > /var/ipfire/fireinfo/public_id + sendprofile --dump > /var/ipfire/fireinfo/profile + ;; + + *) + echo "Usage: ${0} {start}" + exit 1 + ;; +esac + +# End $rc_base/init.d/fireinfo

hooks/post-receive -- IPFire 2.x development tree