Commit Graph

7755 Commits

Author SHA1 Message Date
Dirk Wagner
bd34e32e4b monit addon: fixed path in init script 2014-06-11 10:54:28 +02:00
Dirk Wagner
1fbd7376b7 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit 2014-05-17 18:43:00 +02:00
Dirk Wagner
6047b2c178 monit addon: Fixed initscript stuff 2014-05-17 18:42:21 +02:00
Michael Tremer
e3b5a052ec core78: Update filelist. 2014-05-17 15:32:56 +02:00
Michael Tremer
53ac77f610 Merge remote-tracking branch 'stevee/ddns-providers' into next 2014-05-17 15:27:53 +02:00
Stefan Schantl
ace810a3f8 snort: Update url's for rule download. 2014-05-17 15:27:21 +02:00
Michael Tremer
cf6abf539e Merge remote-tracking branch 'alpha197/patch-1' into next 2014-05-17 15:18:52 +02:00
Michael Tremer
080568824d Merge remote-tracking branch 'origin/master' into next 2014-05-17 15:18:43 +02:00
Michael Tremer
0f7ee3ea4e sslscan: New package. 2014-05-16 17:12:43 +02:00
Stefan Schantl
5a9f40613e setddns.pl: Switch off debuging output.
Switch off accidently enabled debugging output from commit
dc98645fd4
2014-05-15 18:47:13 +02:00
Alf Høgemark
1638682beb cgi-bin: Add title attribute to input type image where missing
Almost all of <input type="image"... has both an alt and a
title attribute, but some are missing title, and when the icon
is not very clear, it makes it harder to understand what the icon
does. By adding title, the browser displays text when mouse pointer
is over the icon.

Also add missing quotes for alt and title attributes where needed.
2014-05-14 21:56:42 +02:00
Alf Høgemark
a9fb14d051 cgi-bin: Use readonly="readonly" attribute on html input elements
The proper way to mark readonly is to use readonly="readonly", not
readonly="true", like it was done some places.
2014-05-14 21:55:28 +02:00
Alf Høgemark
040b8b0c5e ovpnmain.cgi: Use language string keys already defined 2014-05-14 21:54:27 +02:00
Alf Høgemark
bc2b3e9483 vpnmain.cgi: htmlcleanup, change html tags from uppercase to lowercase 2014-05-14 21:51:50 +02:00
Alexander Marx
d9fe569366 openvpn: Wrong subnet calculation bug fix.
Fixes #10466.
2014-05-14 21:47:23 +02:00
Michael Tremer
ed4b4c19b9 Re-apply: OpenVPN: Fix daemon stuck in WAIT state.
When the client is in the WAIT state, it is usally connected
to the server.

Conflicts:
	html/cgi-bin/index.cgi
	html/cgi-bin/ovpnmain.cgi
2014-05-14 21:46:22 +02:00
Michael Tremer
7e8d006496 core78: Add updated theme functions.pl. 2014-05-14 21:32:04 +02:00
Michael Tremer
6fde3230a8 Merge branch 'master' into next 2014-05-14 21:30:50 +02:00
Michael Tremer
a50dadc229 openvpn: Remove RC2 as a cipher option. 2014-05-14 21:28:45 +02:00
Erik Kapfer
f527e53f54 ovpn_fixes: Fixed some typos and strcture.
Fixes #10462#c21.

Conflicts:
	html/cgi-bin/ovpnmain.cgi
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
2014-05-14 21:26:42 +02:00
Michael Tremer
b7ca450650 core78: Add OpenVPN changes. 2014-05-14 20:42:41 +02:00
Michael Tremer
cf910b536a daq: Update to version 2.0.2. 2014-05-14 20:39:36 +02:00
Michael Tremer
d3782f77ba core78: Add all recently changes files and packages. 2014-05-14 20:33:33 +02:00
Michael Tremer
28f44b83c3 core78: Don't remove the ipfire theme. 2014-05-14 20:31:12 +02:00
Michael Tremer
172c1f72c4 ppp: Import some more patches from Fedora. 2014-05-14 20:20:36 +02:00
Michael Tremer
0a511b7693 ppp: Try longer to connect via PPPoE (60 seconds). 2014-05-14 20:02:55 +02:00
Stefan Schantl
f353972f3f Change update url for spDNS.de. 2014-05-14 19:52:06 +02:00
Arne Fitzenreiter
aab13a8d9d backupiso: change to hybrid image. 2014-05-14 18:59:22 +02:00
Arne Fitzenreiter
2308525f0c start core78. 2014-05-14 18:53:51 +02:00
Michael Tremer
1f99fc9845 openvpn: Fix wrong default port number. 2014-05-13 20:36:58 +02:00
alpha197
edb7235c38 xen-image-maker: Fix wrong menu entry for pygrub
Should fix https://bugzilla.ipfire.org/show_bug.cgi?id=10499
2014-05-13 19:00:04 +02:00
Bernhard Bitsch
9cf34ad1ed DDNS: Add support for spdns.de.
This commit adds support for the dynamic dns service provider spdns.de.

Fixes #10533.
2014-05-12 19:53:51 +02:00
Michael Tremer
dbe2a1cc36 Merge remote-tracking branch 'stevee/snort-update' into next 2014-05-12 19:30:02 +02:00
Michael Tremer
d25b7c32bd Merge remote-tracking branch 'glotzi/nut-update' into next 2014-05-12 13:49:12 +02:00
Michael Tremer
dd58c50c3e proxy.pac: Don't use proxy for direct domain access. 2014-05-12 13:21:24 +02:00
Bernhard Bitsch
7c1b7d3e22 proxy.pac: Only grant direct access for actual subnets.
Fixes #10324.
2014-05-12 13:16:43 +02:00
Michael Tremer
27ecea56ce squid: Update to 3.4.5. 2014-05-12 12:54:48 +02:00
Michael Tremer
c6d9cb76ab openvpn: Update translation.
DH keys are actually called DH parameters.
2014-05-12 12:54:08 +02:00
Stefan Ernst
b1ab4a4dd0 DDNS: Add support for variomedia.de.
This commit adds support for the dynamic dns service provider variomedia.de.

Fixes #10485.
2014-05-11 20:06:20 +02:00
Stefan Schantl
02c542d173 DDNS: Add support for twodns.de.
This commit adds support for the dynamic dns service provider twodns.de.

Fixes #10418.
2014-05-11 19:58:31 +02:00
Stefan Schantl
afe1107dc9 snort: Update to 2.9.6.1. 2014-05-11 19:26:32 +02:00
Arne Fitzenreiter
1a200cffc9 clamav: update to 0.98.3. 2014-05-11 19:01:45 +02:00
Michael Tremer
661cd276b6 Merge remote-tracking branch 'ummeegge/openvpn' into next
Conflicts:
	html/cgi-bin/ovpnmain.cgi
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
2014-05-11 18:47:11 +02:00
Michael Tremer
b2e75449a9 Revert "OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design."
This reverts commit c2b5d12b34.

Conflicts:
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
2014-05-11 18:34:34 +02:00
Michael Tremer
b9e1738442 Merge remote-tracking branch 'ummeegge/OpenVPN' into next 2014-05-11 18:27:50 +02:00
Erik Kapfer
6d49c4a631 OpenVPN: Update to version 2.3.4 2014-05-11 09:28:53 +02:00
Erik Kapfer
49abe7afb1 OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design.
Added HMAC algorithm selection menu for N2N and RW.
Added cipher selection menu for N2N connections.
Added DH key selection also for existing installations incl. DH key upload possibility.
Adjusted the ovpn main WUI design to IPSec WUI.
Extend key lenght for CA, cert and control channel with faktor 2.
Some code and typo cleanup.
Bugfixes for #10317, #10149, #10462, #10463
V.2 New changes:
Integrated changes in langs and ovpnmain.cgi until 20.03.2014 2.15-Beta3.
ovpn.cnf have now default bits of 2048 instead of 1024.
ovpn.cnf default_md works now with sha256 instead of md5.
Bugfix: By new installation the auth directive for RWs is faded out #10462 Comment 15.
Added error message if the crl should be displayed but no crl is present.
v.3 New changes #10462 Comment 20:
Updated to core version 77.
Deleted manual name award in DH key upload section, name will be given automatically now.
Added sha512WithRSAEncryption instead of sha1WithRSAEncryption for "Root Certificate".
Added tls-auth support for Roadwarriors.
Added crypto engine support for N2N and Roadwarriors.
2014-05-11 09:24:04 +02:00
Michael Tremer
6e8089a94f theme: Fix spacing of version string in footer. 2014-05-10 14:25:36 +02:00
Ersan Yildirim
03fa5cba13 Update Turkish translation of the installer and setup. 2014-05-09 15:01:17 +02:00
Dirk Wagner
e8cee92b70 Merge branch 'asterisk-update' into monit 2014-05-09 13:48:03 +02:00