Commit Graph

815 Commits

Author SHA1 Message Date
Michael Tremer
83371d5f57 Fix ID information on IPSec configuration.
As the documentation of strongswan says, it is allowed to enter IP
addresses as leftid or rightid without an "@" in the beginning.

Fixed that you can now enter something like "10.20.30.40".

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2011-05-09 01:18:03 +02:00
Arne Fitzenreiter
889caec5d9 Merge branch 'kernel39' into next 2011-04-28 18:46:45 +02:00
Arne Fitzenreiter
342fa5543a core49: add backup.cgi to core update. 2011-04-28 18:45:18 +02:00
Arne Fitzenreiter
afbb5d0a18 Merge branch 'master' into kernel38 2011-04-26 08:51:24 +02:00
Arne Fitzenreiter
339dbffc70 mdadm: add cgi to display the md-state. 2011-04-22 17:03:23 +02:00
Arne Fitzenreiter
b5e9f17b66 Merge branch 'master' into kernel38 2011-04-18 23:27:27 +02:00
Arne Fitzenreiter
8ace0e749b core49: add serices.cgi to core-update. 2011-04-18 23:26:26 +02:00
Arne Fitzenreiter
09e923afef kernel: update to 2.7.32.38. 2011-04-18 20:46:50 +02:00
Arne Fitzenreiter
0c8b5bf924 Merge branch 'master' into kernel38 2011-04-17 23:15:38 +02:00
Arne Fitzenreiter
154fbbe9fc core49: add extrahd changes to updater. 2011-04-17 18:11:31 +02:00
Arne Fitzenreiter
b1e4de058e add initskript to wait until slower drives are present at boot.
fixes: #757
2011-04-17 18:01:03 +02:00
Arne Fitzenreiter
2909e8b90f core49: fix squid initskript path. 2011-04-16 14:56:06 +02:00
Arne Fitzenreiter
9c8fb3f278 core49: added updated icons. 2011-04-16 14:42:18 +02:00
Arne Fitzenreiter
e865603286 Merge branch 'master' into kernel36
Conflicts:
	config/rootfiles/common/Mail-Tools
2011-04-10 10:44:33 +02:00
Arne Fitzenreiter
603e55bb10 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
Conflicts:
	config/rootfiles/core/49/filelists/files
2011-04-10 10:39:08 +02:00
Arne Fitzenreiter
377aa9b34d rootfile update: Mail-Tools, core48. 2011-04-10 10:37:28 +02:00
Christian Schmidt
f40fd7918a Changed openvpn CGI to create a CN without a blank as this may leed to errors when using the verify script.
Even removed the net2net display options. Host connections should be default now.
2011-04-09 12:33:29 +02:00
Christian Schmidt
6456279f4f Changed snort update string to match the more relevant information. 2011-04-05 19:15:36 +02:00
Christian Schmidt
80c7f007fe Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
Conflicts:
	config/rootfiles/core/49/filelists/files
2011-04-02 19:49:11 +02:00
Christian Schmidt
78e1facfba Change squid init script to kill remaining clamav redirectors. 2011-04-02 19:45:12 +02:00
Christian Schmidt
d02e057e21 Added ntfs-3g to core49. 2011-04-02 19:44:35 +02:00
Arne Fitzenreiter
cadb66f381 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
Conflicts:
	config/rootfiles/core/49/filelists/files
	config/rootfiles/core/49/update.sh
2011-04-02 17:56:33 +02:00
Arne Fitzenreiter
2d84d37af6 Started core49. 2011-04-02 17:52:42 +02:00
Christian Schmidt
e3341bc216 Fixded localhost webservers are directed to the proxy if auto
configuration is used.

Fixes bug #770
2011-04-02 14:32:31 +02:00
Arne Fitzenreiter
9f0b9436d8 kernel: Updated to 2.6.32.26. 2011-04-02 12:16:53 +02:00
Arne Fitzenreiter
efaf7bd8df Started core upgrade 49. 2011-03-29 17:23:26 +02:00
Arne Fitzenreiter
7a524f82b9 core48: add missing perl-GD modules. 2011-03-29 16:19:22 +02:00
Arne Fitzenreiter
a727dcf727 compat-wireless: update to 2.6.38-3-ns. 2011-03-21 14:02:14 +01:00
Arne Fitzenreiter
25224e2adc core48: add missing Net_SSLeay perl files. 2011-03-18 20:57:00 +01:00
Arne Fitzenreiter
aedfdf8397 core48: add missing ids.cgi to core48. 2011-03-18 08:35:35 +01:00
Arne Fitzenreiter
11c96d4a74 pppsetup.cgi: add vdsl vlan setting also if igmpproxy is not present. 2011-03-17 22:43:55 +01:00
Christian Schmidt
aa96645613 Added backup.pl and missing daq update to core update. 2011-03-15 18:31:37 +01:00
Arne Fitzenreiter
d0cf29f084 core: add snort update to core. 2011-03-15 09:14:41 +01:00
Arne Fitzenreiter
fc5592af4d core: add squid to core48. 2011-03-15 09:12:34 +01:00
Arne Fitzenreiter
1b3cc041d9 Merge branch 'perl' 2011-02-28 08:15:45 +01:00
Arne Fitzenreiter
4c93a9317f Fix name generation of old core updates. 2011-02-27 10:18:59 +01:00
Arne Fitzenreiter
a16cd7f0ee Fix core updater 45-48 to remove only old core updates from cache. 2011-02-26 20:05:06 +01:00
Arne Fitzenreiter
4407b34712 Move perl update from core47 to 48. 2011-02-25 09:02:34 +01:00
Arne Fitzenreiter
68388766c3 Merge branch 'master' into perl 2011-02-25 09:01:28 +01:00
Arne Fitzenreiter
2daf2ca308 Started core48. 2011-02-25 09:00:09 +01:00
Arne Fitzenreiter
bbb7dc0420 proxy.cgi: fix filename of ntlm authenticator. 2011-02-24 08:10:59 +01:00
Arne Fitzenreiter
4eb60dc780 updated perl (5.12.3). 2011-02-24 08:06:48 +01:00
Arne Fitzenreiter
4200583c70 Merge branch 'master' into perl_5.12.2
Conflicts:
	config/rootfiles/core/47/filelists/files
	config/rootfiles/core/47/update.sh
2011-02-20 17:37:07 +01:00
Arne Fitzenreiter
a408c745d7 Updated php (5.3.5). 2011-02-20 15:51:15 +01:00
Arne Fitzenreiter
ff7a39506a Add iptv/inet vlan settings to webif. 2011-02-19 15:07:54 +01:00
Arne Fitzenreiter
5c0dc418e4 Add fireinfo to core47. 2011-02-18 20:34:08 +01:00
Arne Fitzenreiter
48a2495afd Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
Conflicts:
	config/rootfiles/core/47/filelists/files
2011-02-18 20:33:00 +01:00
Arne Fitzenreiter
abcbbd1fd7 Add ssh ecdsa hostkey. 2011-02-18 20:31:19 +01:00
Christian Schmidt
9fd6aa06b6 Added outgoing fw groups to backup. 2011-02-13 10:35:41 +01:00
Christian Schmidt
c703cd4ce5 Changed sourcefire download link to current snort version. 2011-02-10 21:43:24 +01:00