Commit Graph

1692 Commits

Author SHA1 Message Date
Michael Tremer
242694089f Merge remote-tracking branch 'stevee/next-cgi-geoip' into next 2015-05-05 12:16:58 +02:00
Stefan Schantl
f28a284c33 Drop old flag icons. 2015-05-03 21:53:03 +02:00
Alexander Marx
382ffe320c Core90: make N2N Graphs higher to them correctly
Graphs in core 89 where not heigh enough so that they where zoomed which
looked bad
2015-05-03 05:12:13 +02:00
Stefan Schantl
3ea01fe042 Multiple CGI's: Use &GeoIP::get_flag_icon for getting country flags. 2015-05-02 13:45:50 +02:00
Michael Tremer
2c531c2132 vpnmain.cgi: Fix ECP regex again for Brainpool curves
The regular expression did not take into account that
there could be characters like "bp" in case of the Brainpool
curves (ecp512bp).
2015-05-01 16:57:13 +02:00
Michael Tremer
6caea1086d Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-04-29 11:26:35 +02:00
Michael Tremer
85a6f39c39 Merge remote-tracking branch 'stevee/core-90-ddnsctrl' into next 2015-04-29 11:26:20 +02:00
Michael Tremer
3bcb59ab21 vpnmain.cgi: Fix prefix for elliptic curve algorithms 2015-04-28 13:22:00 +02:00
Jochen Kauz
a24062d12b vpnmain.cgi: dpd_delay/dpd_timeout wrong entry in ipsec.conf
Fixes #10636
2015-04-28 11:30:05 +02:00
Stefan Schantl
023919034a ddns.cgi: Use ddnsctrl for instant update. 2015-04-26 16:52:52 +02:00
Stefan Schantl
851a984121 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-04-22 18:25:25 +02:00
Stefan Schantl
b013822b99 Rename Locale::Country to Locale::Codes::Country in various scripts.
The new Locale-Country version needs to be loaded and used by specifing
Locale::Codes::Country since an upstream API change. Adjusting various perl
scripts to use the module in the proper way again.
2015-04-22 18:18:38 +02:00
Michael Tremer
a4d24f9052 vpnmain.cgi: Order ciphers by strength
strongSwan uses them in the defined order. Hence it makes
much more sense to present them to the user as well in that
order.
2015-04-22 14:45:10 +02:00
Michael Tremer
78039c1585 vpnmain.cgi: Use integrity functions as PRF for AEAD 2015-04-22 14:44:16 +02:00
Michael Tremer
e8b3bb0edc vpnmain.cgi: Rewrite algorithm generation code 2015-04-22 14:08:41 +02:00
Michael Tremer
db1078ff11 index.cgi: Hide blue and green if not enabled
Those were shown when a blue or orange interface
was assigned which is not the same as enabled.
2015-04-22 13:06:52 +02:00
Michael Tremer
a47376207f ipsec: Always enable support for IKE fragmentation 2015-04-21 19:36:40 +02:00
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