Michael Tremer
de0ccf8f8c
Merge branch 'master' into next
...
Conflicts:
make.sh
2015-02-04 13:24:05 +01:00
Michael Tremer
fe53fa8dac
Merge remote-tracking branch 'ummeegge/lynis' into next
...
Conflicts:
make.sh
2015-01-28 22:49:36 +01:00
Arne Fitzenreiter
12f74b8f91
wlanap.cgi: remove trailing 0 from channellist.
2015-01-21 14:20:54 +01:00
Michael Tremer
f57a228c4b
ipsec: Allow IKE lifetime of up to 24 hours
...
Requested in #10722
The recommended time has not been changed, but it is often
stated that 24 hours is a common lifetime for IKE.
2015-01-19 17:04:37 +01:00
Michael Tremer
3906cf7e85
Merge remote-tracking branch 'amarx/vpn-statistic1' into next
2015-01-13 17:37:18 +01:00
Stefan Schantl
82bd80b387
ddns.cgi: Add support for token based auth for spdns.de.
2015-01-09 19:43:37 +01:00
Arne Fitzenreiter
8e23b35195
wlanap.cgi: add country code 00;
...
regdump not display this anymore.
2015-01-04 22:11:44 +01:00
Arne Fitzenreiter
2bb836df11
hostapd: change default channel to 6.
2015-01-04 20:17:26 +01:00
Alexander Marx
87fe47e9d9
vpn-statistic: Move logfiles to /var/run because of flash writes
2014-12-23 12:43:49 +01:00
Michael Tremer
18f2b3d171
Merge remote-tracking branch 'ummeegge/OpenVPN_additional_configs' into next
2014-12-08 19:12:48 +01:00
Michael Tremer
1450cfebde
Merge remote-tracking branch 'ummeegge/OpenVPN_validating_N2N' into next
2014-12-08 19:12:39 +01:00
Erik Kapfer
badd8c1c63
OpenVPN_rand: Deleted pseudo-random generator option.
...
Deleted the -rand /proc/interrupts:/proc/net/rt_cache option in ovpnmain.cgi
Fix #10682
2014-12-06 13:03:59 +01:00
Erik Kapfer
f4fbb93510
OpenVPN: Added 'valid til (days)' field for N2N.
...
Fixes #10680
2014-11-13 10:40:42 +01:00
Erik Kapfer
ffbe77c8bc
OpenVPN: Added additional configuration for server and clients
...
* Added a possibility to manualy extend OpenVPNs server and client configuration.
* Added also a checkbox (on/off) in the WUI under 'Advanced server options' .
* Changed the order in 'Miscellaneous options' section for better overview.
* Optimized code in particular sections a little.
Added a filehandle instead of system(touch...) for ccd* file generation.
Unified the html code tags in processed section.
Fixes #10577
2014-11-13 03:09:51 +01:00
Matthias Fischer
8d29504c4d
snort: Update urls for rules download (2.9.7.0) in 'ids.cgi'
2014-11-05 19:20:59 +01:00
Alexander Marx
c9ac8b8052
vpn-statistics: change graphs and datatypes of rrd
2014-10-21 07:29:06 +02:00
Michael Tremer
478d8bb5da
Merge remote-tracking branch 'teissler/bug_10535' into next
2014-09-27 23:00:05 +02:00
Timo Eissler
1c4308c1f2
urlfilter.cgi: enhance file extension blocking
...
Fixes #10535
Add flv, mkv and mp4 as audio/video file exentions.
Add 7z as archive file extension.
2014-09-27 22:24:26 +02:00
Michael Tremer
0e6e5d46c1
Merge remote-tracking branch 'teissler/Bug_10415' into next
2014-09-27 20:43:23 +02:00
Timo Eissler
6ae884e5f9
urlfilter.cgi: safe search enhancements
...
Fixes : #10415
Activate bing safe search.
Add nwshp to google url patterns.
2014-09-26 22:15:13 +02:00
Michael Tremer
60bce6ba6a
Merge remote-tracking branch 'amarx/BUG10615' into next
2014-09-26 13:02:28 +02:00
Michael Tremer
b14e0f7d0e
Merge remote-tracking branch 'amarx/fw-checksubnet' into next
2014-09-26 12:59:26 +02:00
Michael Tremer
df6649b0fe
Merge remote-tracking branch 'amarx/firewall-dnat' into next
...
Conflicts:
config/firewall/rules.pl
2014-09-26 12:55:55 +02:00
Alexander Marx
0d0ee70f3b
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into vpn-statistic1
2014-09-26 12:53:05 +02:00
Stefan Schantl
34ebab463b
urlfilter.cgi: Fix path to squidGuard binary when converting custom blacklists.
...
Fixes #10626 .
2014-09-20 11:49:39 +02:00
Alexander Marx
d8cc443938
fw-groups: fix language strings
2014-09-19 13:44:20 +02:00
Alexander Marx
59c2888bae
BUG10617: Allow rules from local networks to firewall itself
2014-09-19 08:11:24 +02:00
Alexander Marx
5795fc1b55
vpn-statistic: added new statistic page for OpenVPN Roadwarrior
2014-09-18 16:29:10 +02:00
Stefan Schantl
9cc46b56ad
logs.cgi/ids.dat: Change url for snort sid details.
...
Fixes #10578 .
2014-09-16 20:37:16 +02:00
Alexander Marx
5751876534
BUG10615: fix wrong values in firewall.cgi
2014-09-11 15:10:48 +02:00
Alexander Marx
d8deec0b4f
BUG10615 part2: Add ratelimit to firewallgui
2014-09-11 13:59:54 +02:00
Alexander Marx
79ad6f7e53
BUG10615 part1: Add connectionlimit to firewallgui
2014-09-11 10:59:25 +02:00
Alexander Marx
3928f52b39
fw-groups: cleanup checksubnets
...
Now the checksubnets function from general-functions.pl is used.
2014-09-05 08:09:54 +02:00
Michael Tremer
8fbcf730ae
proxy.cgi: Move ACL definitions up
...
ACl definitions could not be used in some other directives
unless they are defined earlier.
2014-08-28 17:01:44 +02:00
Michael Tremer
2fc5124b7e
proxy: Allow HTTP Basic authentication against Active Directory servers
...
Some clients may not support NTLMv2. Basic authentication can
now be activated. This is dangerous as it sends the credentials
in cleartext to the proxy server.
2014-08-11 11:49:56 +02:00
Michael Tremer
935c2f233b
Merge remote-tracking branch 'ms/ddns.cgi-fixes' into next
...
Conflicts:
html/cgi-bin/ddns.cgi
2014-08-07 21:06:13 +02:00
Stefan Schantl
4851bc81f3
ddns.cgi: Support hostname details without seperating dots.
...
To keep compatiblity with the settings file of the old DDNS update script
(setddns.pl) we keept the storrage of the hostname information in
two parts (hostname and domain) and connected both with a dot to get a valid
FQDN again. OpenDNS and may some other providers do not use a dotted format
for this information, so one of these two values were empty.
We now can handle such cases in a right way.
2014-08-07 21:02:10 +02:00
Michael Tremer
a6df80269b
ddns.cgi: Fix CGI clearing all settings.
2014-08-07 20:58:33 +02:00
Michael Tremer
c330d115bf
ddns.cgi: Fix coding style.
2014-08-07 20:40:14 +02:00
Michael Tremer
458064c519
ddns.cgi: Allow enabling/disabling entries.
2014-08-07 20:33:10 +02:00
Michael Tremer
908555842c
Merge remote-tracking branch 'ms/firewall-no-nat' into next
...
Conflicts:
doc/language_issues.nl
doc/language_issues.tr
2014-08-07 14:50:42 +02:00
Stefan Schantl
c2f80e67a7
ddns.cgi: Fix enable/disable handling of entries.
...
When the "enabled" checkbox is checked a "on" will be returned,
if the box is unchecked checkboxes will return nothing.
As a result of this behaviour the ddns.conf contained entries which have been disabled in the WUI.
We now check if the checkbox returns a "on", otherwise we will set the "enabled" value to "off" to
prevent from this problem.
2014-08-05 21:24:44 +02:00
Erik Kapfer
156311fbcd
OpenVPN: Added a check for empty 'CERT_NAME' field.
...
Fixes : #10581
2014-08-04 21:18:45 +02:00
Stefan Schantl
1f080b34ba
ddns.cgi: Check for valid FQDN before doing nslookup.
...
We now check if the used hostname is a valid FQDN before doing the nslookup to
determine if a DDNS host is up do date.
2014-08-04 19:37:45 +02:00
Stefan Schantl
5fe185f83c
ddns.cgi: Fix token auth for provider regfish.com.
...
In the past the regfish.com auth token was stored as username similar than freedns.afraid.com. We now expected
the token key stored as password, to keep compatiblity with old installations I've added some compatible code
to prevent users from various issues.
2014-08-04 12:53:59 +02:00
Erik Kapfer
194314b250
OpenVPN: Added a check for empty 'CERT_NAME' field.
...
Fixes : #10581
2014-07-31 15:39:49 +02:00
Erik Kapfer
b3f401fba4
ids.cgi fix snort rules download url.
...
fixes: 10579
2014-07-29 22:31:26 +02:00
Arne Fitzenreiter
f0728c790f
Merge remote-tracking branch 'origin/master' into next
...
Conflicts:
config/cfgroot/general-functions.pl
2014-07-29 22:01:19 +02:00
Michael Tremer
10cd52ba8e
Merge remote-tracking branch 'stevee/next-ddns-opendns.com-fix' into next
2014-07-27 12:36:11 +02:00
Stefan Schantl
dc07707153
ddns.cgi: Support hostname details without seperating dots.
...
To keep compatiblity with the settings file of the old DDNS update script
(setddns.pl) we keept the storrage of the hostname information in
two parts (hostname and domain) and connected both with a dot to get a valid
FQDN again. OpenDNS and may some other providers do not use a dotted format
for this information, so one of these two values were empty.
We now can handle such cases in a right way.
2014-07-27 12:06:27 +02:00