From 1ce6d69655ba8f6f37b1dd820c7e069fcf1b3167 Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 8 Jun 2006 13:17:52 +0000 Subject: [PATCH] =?utf8?q?Hinzugef=C3=BCgt:=20=20=20*=20Morningreconnect?= =?utf8?q?=20-=20Danke=20an=20Benedikt=20Ge=C3=A4ndert:=20=20=20*=20Stop-B?= =?utf8?q?ug=20im=20OpenVPN=20behoben=20-=20wieder=20Danke=20an=20Benedikt?= =?utf8?q?=20=20=20*=20CA=20nach=20IPFire=20umbenannt.=20=20=20*=20Sprachd?= =?utf8?q?ateien=20bearbeitet=20=20=20*=20Snort=20aktualisiert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@167 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/ssl/openssl.cnf | 2 +- doc/packages-list.txt | 1 + html/cgi-bin/ovpnmain.cgi | 21 ++++++++------------- html/cgi-bin/pppsetup.cgi | 19 +++++++++++++------ langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 9 ++++++++- lfs/linux | 8 ++++---- lfs/snort | 17 ++++++----------- src/scripts/morningreconnect | 2 +- 9 files changed, 43 insertions(+), 38 deletions(-) diff --git a/config/ssl/openssl.cnf b/config/ssl/openssl.cnf index 092923fca5..e1689e2615 100644 --- a/config/ssl/openssl.cnf +++ b/config/ssl/openssl.cnf @@ -7,7 +7,7 @@ oid_section = new_oids [ ca ] default_ca = IPFire -[ IPCop ] +[ IPFire ] dir = /var/ipfire certs = $dir/certs crl_dir = $dir/crls diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 6ff9e485e1..544dc611a2 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -199,6 +199,7 @@ * shadow-4.0.4.1 * slang-1.4.5-mini * snort-2.3.3 + * snort-2.4.5 * spandsp-0.0.2pre25 * speedtouch-1.2 * squid-2.5.STABLE14 diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 33e6140b97..3418ba8bd6 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -6,7 +6,7 @@ # ZERNINA-VERSION:0.9.7a7 # (c) 2005 Ufuk Altinkaynak # -# Ipcop and OpenVPN eas as one two three.. +# Ipcop and OpenVPN easy as one two three.. # use CGI; @@ -73,7 +73,6 @@ $cgiparams{'DCOMPLZO'} = 'off'; if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} || $cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'} || $cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}) { - my $serveractive = `/bin/ps ax|grep server.conf|grep -v grep|awk \'{print \$1}\'`; #start openvpn server if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'}){ &Ovpnfunc::emptyserverlog(); @@ -81,24 +80,19 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} || } #stop openvpn server if ($cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'}){ - if ($serveractive ne ''){ - system('/usr/local/bin/openvpnctrl', '-kn2n', $serveractive); - } system('/usr/local/bin/openvpnctrl', '-k'); - &Ovpnfunc::emptyserverlog(); + &Ovpnfunc::emptyserverlog(); } # #restart openvpn server if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){ #workarund, till SIGHUP also works when running as nobody - if ($serveractive ne ''){ - system('/usr/local/bin/openvpnctrl', '-kn2n', $serveractive); - } - system('/usr/local/bin/openvpnctrl', '-k'); - &Ovpnfunc::emptyserverlog(); - system('/usr/local/bin/openvpnctrl', '-s'); + system('/usr/local/bin/openvpnctrl', '-r'); + &Ovpnfunc::emptyserverlog(); } } + + ### ### Save Advanced options ### @@ -1789,7 +1783,8 @@ END if ($cgiparams{'ZERINA_CLIENT'} eq ''){ $cgiparams{'ZERINA_CLIENT'} = 'no'; } - } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {#ab hiere error uebernehmen +#ab hiere error uebernehmen + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); # n2n error if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 93098add92..3e60865185 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -6,12 +6,6 @@ # # (c) The SmoothWall Team # -# Copyright (C) 03-Apr-2002 Guy Ellis -# - ISDN DOV support -# - ibod now an option -# - PCI ADSL support added -# -# $Id: pppsetup.cgi,v 1.17.2.49 2005/12/01 16:20:35 franck78 Exp $ use strict; @@ -61,6 +55,9 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { + if ($pppsettings{'MORNINGRECONNECT'} eq 'on') + { system("/bin/touch /var/ipfire/ppp/morningreconnect"); } + else { unlink "/var/ipfire/ppp/morningreconnect"; } if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|usb\/ttyACM0|usb\/ttyACM1|usb\/ttyACM2|usb\/ttyACM3|isdn1|isdn2)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } @@ -401,6 +398,10 @@ $checked{'DIALONDEMANDDNS'}{'off'} = ''; $checked{'DIALONDEMANDDNS'}{'on'} = ''; $checked{'DIALONDEMANDDNS'}{$pppsettings{'DIALONDEMANDDNS'}} = "checked='checked'"; +$checked{'MORNINGRECONNECT'}{'off'} = ''; +$checked{'MORNINGRECONNECT'}{'on'} = ''; +$checked{'MORNINGRECONNECT'}{$pppsettings{'MORNINGRECONNECT'}} = "checked='checked'"; + $checked{'AUTOCONNECT'}{'off'} = ''; $checked{'AUTOCONNECT'}{'on'} = ''; $checked{'AUTOCONNECT'}{$pppsettings{'AUTOCONNECT'}} = "checked='checked'"; @@ -691,6 +692,12 @@ print <$Lang::tr{'maximum retries'} + + Morning Reconnect: + +   +   + END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 4e5ec8eed3..cae935bcf9 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1046,7 +1046,7 @@ 'invalid input for max clients' => 'Ungültige Eingabe für Max Clients', 'invalid input for keepalive 1' => 'Ungültige Eingabe für Keepalive ping', 'invalid input for keepalive 2' => 'Ungültige Eingabe für Keepalive ping-restart', -'valid till' => 'Güig bis', +'valid till' => 'Gültig bis', 'ovpn_processprio' => 'Prozesspriorität', 'ovpn_fastio' => 'Fast-IO', 'ovpn_mtudisc' => 'MTU-Discovery', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7022f234b6..d9d958d04a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -176,6 +176,7 @@ 'current rules' => 'Current rules:', 'custom networks' => 'Custom networks', 'custom services' => 'Custom services', +'daily firewallhits' => 'daily firewallhits', 'dat without key' => 'An encrypted archive cannot be restored without the key.', 'date' => 'Date', 'date not in logs' => 'No (or only partial) logs exist for the day queried', @@ -332,6 +333,7 @@ 'filename' => 'Filename', 'filesystem full' => 'Filesystem full', 'firewall' => 'Firewall', +'firewall graphs' => 'Firewall Graphs', 'firewall hits' => 'Total number of firewall hits for', 'firewall log' => 'Firewall log', 'firewall log viewer' => 'Firewall Log Viewer', @@ -568,6 +570,7 @@ 'modulation' => 'Modulation', 'monday' => 'Monday', 'month' => 'Month', +'monthly firewallhits' => 'monthly firewallhits', 'months' => 'months', 'mounted on' => 'Mounted on', 'name' => 'Name', @@ -756,9 +759,11 @@ 'shaping list options' => 'Traffic shaping services', 'shared' => 'shared', 'shared memory' => 'Shared Memory', +'show areas' => 'show areas', 'show ca certificate' => 'Show CA Certificate', 'show certificate' => 'Show Certificate', 'show host certificate' => 'Show Host Certificate', +'show lines' => 'show lines', 'show root certificate' => 'Show Root Certificate', 'shutdown' => 'Shutdown', 'shutdown control' => 'Shutdown control', @@ -923,6 +928,7 @@ 'web server' => 'Web server', 'website' => 'Website', 'wednesday' => 'Wednesday', +'weekly firewallhits' => 'weekly firewallhits', 'week' => 'Week', 'weeks' => 'weeks', 'wildcards' => 'Wildcards', @@ -933,6 +939,7 @@ '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', +'yearly firewallhits' => 'yearly firewallhits', 'yes' => 'Yes', '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', @@ -977,7 +984,7 @@ 'quick control' => 'Quick Control', 'allmsg' => 'show all', 'selecttraffic' => 'Select utilization-overview:', -'sstraffic' => 'net-traffic', +'sstraffic' => 'Net-Traffic', 'trafficblue' => 'WLAN', 'trafficdate' => 'Date', 'trafficfrom' => 'From', diff --git a/lfs/linux b/lfs/linux index 847c119724..c1d4fb10b4 100644 --- a/lfs/linux +++ b/lfs/linux @@ -38,15 +38,15 @@ CXXFLAGS = # Normal build or /tools build. # ifeq "$(ROOT)" "" -ifeq "$(LFS_PASS)" "ipcop" +ifeq "$(LFS_PASS)" "ipfire" ifeq "$(SMP)" "" - TARGET = $(DIR_INFO)/$(THISAPP)-ipcop + TARGET = $(DIR_INFO)/$(THISAPP)-ipfire endif ifeq "$(SMP)" "1" - TARGET = $(DIR_INFO)/$(THISAPP)-ipcop-smp + TARGET = $(DIR_INFO)/$(THISAPP)-ipfire-smp endif ifeq "$(SMP)" "installer" - TARGET = $(DIR_INFO)/$(THISAPP)-ipcop-installer + TARGET = $(DIR_INFO)/$(THISAPP)-ipfire-installer endif else TARGET = $(DIR_INFO)/$(THISAPP) diff --git a/lfs/snort b/lfs/snort index 88f0c2d35b..e576f82e94 100644 --- a/lfs/snort +++ b/lfs/snort @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: snort,v 1.6.2.11 2005/11/05 19:53:45 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 2.3.3 +VER = 2.4.5 THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = http://www.snort.org/dl/old +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -48,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 06bf140893e7cb120aaa9372d10a0100 +$(DL_FILE)_MD5 = 108b3c20dcbaf3cdb17ea9203342eaaa install : $(TARGET) @@ -85,8 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install mv /usr/bin/snort /usr/sbin/ -mkdir /etc/snort - cd $(DIR_APP) && install -m 0644 rules/*.rules \ - etc/unicode.map etc/reference.config etc/classification.config /etc/snort + # Keine Rules zum Kopieren vorhanden. Müssen über das Webinterface geladen werden. + #cd $(DIR_APP) && install -m 0644 rules/*.rules \ + # etc/unicode.map etc/reference.config etc/classification.config /etc/snort install -m 0644 $(DIR_SRC)/config/snort/snort.conf /etc/snort chown -R nobody:nobody /etc/snort -mkdir -p /var/log/snort diff --git a/src/scripts/morningreconnect b/src/scripts/morningreconnect index 82dfc92acd..0dcfa0b6be 100644 --- a/src/scripts/morningreconnect +++ b/src/scripts/morningreconnect @@ -8,7 +8,7 @@ # begin -if [ -e "/var/ipfire/morningreconnect/enable" ]; then +if [ -e "/var/ipfire/ppp/morningreconnect" ]; then logger -t ipfire MorningReconnect executed! /etc/rc.d/rc.red stop /bin/sleep 10 -- 2.39.2