Arne Fitzenreiter
c17883fdcd
wlansp.cgi: remove MADWIFI functions.
2015-04-11 22:18:26 +02:00
Arne Fitzenreiter
05583186d6
wlanap.cgi: hide "no IR" channels
2015-04-11 22:09:18 +02:00
Arne Fitzenreiter
0fbba54e82
Merge branch 'master' into next
...
Conflicts:
lfs/monit
2015-04-11 21:58:09 +02:00
Michael Tremer
1e499e90d7
openvpn: Stop N2N connections before they are removed
2015-04-10 13:32:48 +02:00
Michael Tremer
187590f791
openvpn: Move remving files in /var/run to openvpnctrl
2015-04-10 13:27:32 +02:00
Alexander Marx
82e454712b
ovpnmain.cgi: Remove duplicate code to remove a connection
2015-04-10 13:13:02 +02:00
Alexander Marx
323be7c44f
ovpnmain.cgi: Fix indentation and code cleanup
...
No functional change
2015-04-10 13:12:14 +02:00
Alexander Marx
679ac9f163
vpn-statistic: change title of ovpn n2n site
...
additionally print errormessages to /dev/null when no rrd data is found
2015-04-09 17:23:05 +02:00
Michael Tremer
d72de3da14
openvpn: Remove stat files when connections are removed
2015-04-09 17:18:44 +02:00
Michael Tremer
2f36a7b43a
openvpn: Remove RRDs when removing all connections at once
2015-04-09 17:11:16 +02:00
Alexander Marx
775b449431
openvpn: Update collectd configuration when connections are started/stopped
2015-04-09 16:44:07 +02:00
Michael Tremer
e1297cbb76
openvpn: Properly remove all RRDs after a connection is removed
2015-04-09 16:32:39 +02:00
Alexander Marx
b98757a139
vpn-statistic: change title of ovpn RW statistic page
...
additionally print errors to /dev/null if no rrd data is found
2015-04-09 14:46:45 +02:00
Stefan Schantl
3b9b58f956
ddns.cgi: Drop code for proto handling.
2015-03-20 19:00:04 +01:00
Wolfgang Apolinarski
3847730c17
Applied patches for not using md5. Additionally, the root CA is no 4096 bits, host/clients are 2048 bits (both RSA). Openssl is now choosing the random seed automatically, removed the '-rand' parameter.
2015-03-17 20:42:41 +01:00
Arne Fitzenreiter
c98cc4ae90
Merge branch 'master' into next
2015-03-17 14:05:56 +01:00
Dominik Hassler
e60cd3a404
use colour of destination network for DNAT
2015-03-13 14:33:47 +01:00
Stefan Schantl
6409aa7e54
ddns.cgi: Add token handling for zzzz.io.
2015-03-12 12:57:36 +01:00
Michael Tremer
dfea4f86c2
strongswan: Allow using AES-GCM in various configurations
2015-03-11 18:13:25 +01:00
Bernhard Bitsch
ea40188f66
BUG10502: Fix wrong interfaces in firewall.log
...
Fix from BeBiMa
2015-03-11 13:53:36 +01:00
Michael Tremer
274ebe1d9d
Merge remote-tracking branch 'origin/master' into next
...
Conflicts:
config/rootfiles/packages/clamav
lfs/clamav
2015-03-04 23:58:47 +01:00
Michael Tremer
ea92da89c6
Merge remote-tracking branch 'amarx/BUG10756' into next
2015-03-03 21:13:46 +01:00
Christoph Anderegg
165b25b2dc
vpnmain.cgi: Added inclusion of ipsec.user-post.conf to the end of ipsec.conf in order to allow connection parameters to be overwritten in ipsec.user.conf.
2015-03-03 11:16:47 +01:00
Alexander Marx
5ca4ae11ae
BUG10756: fixes possibillity to enable logging when editing a rule. Also remark can be deleted
2015-03-02 15:33:44 +01:00
Alexander Marx
84a0531148
BUG10756: consolidate rulecheck
2015-03-02 15:20:32 +01:00
Alexander Marx
85abeb1376
BUG10753: Fix servicegroups to have only max. 15 services per protocol
2015-02-25 08:09:05 +01:00
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
