Commit Graph

1675 Commits

Author SHA1 Message Date
Stefan Schantl
fde9c9dd03 ovpnmain.cgi: Update the certificate revocation list when a connection has been deleted.
Reference #10554.
2015-04-19 12:51:44 +02:00
Stefan Schantl
c98b743c09 firewall.cgi: Dynamically show/hide DNAT and SNAT configure elements.
Fixes #10732.
2015-04-19 01:19:11 +02:00
Wolfgang Apolinarski
ab2d15486b Added clientAuth to EKU of client certificate. Fixed the comment. 2015-04-18 23:32:14 +02:00
Stefan Schantl
e6c4f090b6 Merge branch 'next-geoip' into core-90-geoip 2015-04-15 17:10:49 +02:00
Arne Fitzenreiter
65f2c9bb39 Merge remote-tracking branch 'origin/master' into next 2015-04-14 17:59:21 +02:00
Alexander Marx
2f075ff8cf vpn-statistic: add URI::escape for openvpn names with special chars 2015-04-14 14:00:47 +02:00
Alexander Marx
7dfcaef067 vpn-statistic: add collectd parameters to imported n2n packages 2015-04-14 13:55:40 +02:00
Arne Fitzenreiter
758d959652 Merge remote-tracking branch 'origin/master' into next 2015-04-13 17:11:41 +02:00
Michael Tremer
b171633c7e Merge remote-tracking branch 'amarx/BUG10796' into next 2015-04-13 12:17:53 +02:00
Michael Tremer
32a5fec71c Merge remote-tracking branch 'amarx/BUG10797' into next 2015-04-13 11:28:57 +02:00
Michael Tremer
5c5b4000b9 vpn-stats: Show daily graph as *all* other graphs do, too 2015-04-13 10:57:09 +02:00
Alexander Marx
39d435690f BUG10797: Fix addontable in services.cgi when using squid-accounting addon
When squid-accounting addon is installed, it shows up under services.cgi
as "squid" service which is wrong.
2015-04-13 08:36:00 +02:00
Alexander Marx
212fd689a3 BUG10796: Fix textoutput when doing pakfire update in WebUI 2015-04-13 07:52:25 +02:00
Stefan Schantl
ad50a299c8 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-04-12 23:23:40 +02:00
Stefan Schantl
578f23c8e1 ovpnmain.cgi: Fix layout of CA related elements.
Those elements where displayed out of the main box in the past.
2015-04-12 23:18:11 +02:00
Arne Fitzenreiter
d4ee6f0813 Merge remote-tracking branch 'origin/master' into next 2015-04-12 22:53:06 +02:00
Michael Tremer
79e7688b69 ovpnmain.cgi: Remove DDEVICE setting
This was used to select a TUN or TAP device from which TAP
was never supported anyway.
2015-04-12 22:33:41 +02:00
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
Stefan Schantl
1ed8aedfdb fwhosts.cgi: Fix fw-reload detection when adding new entries to a geoip group.
Read-in firewall config files for detection if the current group is used
by at least one firewall rule and mark the firewall to need a reload if
neccessary.

Fixes #10771.
2015-03-15 11:41:50 +01:00
Stefan Schantl
93bfe63d55 Merge branch 'seventeen-geoip' into next-geoip 2015-03-15 11:38:45 +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
Stefan Schantl
bc9446c65f Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip
Conflicts:
	make.sh
2015-02-14 12:34:31 +01:00
Stefan Schantl
c0a97a0f4a firewall.cgi: Add support for GeoIP locations / GeoIP groups. 2015-02-08 18:41:44 +01:00
Stefan Schantl
e472a10de9 geoip-block.cgi: Use geoip-functions.pl. 2015-02-08 18:24:51 +01:00
Stefan Schantl
4313aa18e9 fwhosts.cgi: Add support for GeoIP groups. 2015-02-08 13:37:06 +01:00
Michael Tremer
de0ccf8f8c Merge branch 'master' into next
Conflicts:
	make.sh
2015-02-04 13:24:05 +01:00