[ ca ]
default_ca = IPFire
-[ IPCop ]
+[ IPFire ]
dir = /var/ipfire
certs = $dir/certs
crl_dir = $dir/crls
* 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
# 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;
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();
}
#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
###
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)$/) {
#
# (c) The SmoothWall Team
#
-# Copyright (C) 03-Apr-2002 Guy Ellis <guy@traverse.com.au>
-# - 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;
}
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; }
$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'";
<td align='right'>$Lang::tr{'maximum retries'}</td>
<td><input type='text' size='5' name='MAXRETRIES' value='$pppsettings{'MAXRETRIES'}' /></td>
</tr>
+<tr>
+ <td align='right'>Morning Reconnect:</td>
+ <td><input type='checkbox' name='MORNINGRECONNECT' $checked{'MORNINGRECONNECT'}{'on'} /></td>
+ <td> </td>
+ <td> </td>
+</tr>
END
;
'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',
'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',
'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',
'modulation' => 'Modulation',
'monday' => 'Monday',
'month' => 'Month',
+'monthly firewallhits' => 'monthly firewallhits',
'months' => 'months',
'mounted on' => 'Mounted on',
'name' => 'Name',
'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',
'web server' => 'Web server',
'website' => 'Website',
'wednesday' => 'Wednesday',
+'weekly firewallhits' => 'weekly firewallhits',
'week' => 'Week',
'weeks' => 'weeks',
'wildcards' => 'Wildcards',
'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.<br />Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.',
'your department' => 'Your Department',
'quick control' => 'Quick Control',
'allmsg' => 'show all',
'selecttraffic' => 'Select utilization-overview:',
-'sstraffic' => 'net-traffic',
+'sstraffic' => 'Net-Traffic',
'trafficblue' => 'WLAN',
'trafficdate' => 'Date',
'trafficfrom' => 'From',
# 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)
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
-# 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 $
-# #
###############################################################################
###############################################################################
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)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 06bf140893e7cb120aaa9372d10a0100
+$(DL_FILE)_MD5 = 108b3c20dcbaf3cdb17ea9203342eaaa
install : $(TARGET)
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
# 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