Arne Fitzenreiter
923ad92ac1
Merge branch 'master' into next
...
Conflicts:
make.sh
2011-07-12 07:40:37 +02:00
Arne Fitzenreiter
70618607ef
squid: update to 3.1.14.
2011-07-12 07:39:11 +02:00
Arne Fitzenreiter
a0f97ae456
core50: stop/start services at update.
2011-07-12 07:38:51 +02:00
Arne Fitzenreiter
4f495b1f23
Merge branch 'strong-dr' into next
2011-07-12 07:37:16 +02:00
Arne Fitzenreiter
2a931aa1cd
strongswan: update to 3.5.3dr7.
2011-07-12 07:35:49 +02:00
Arne Fitzenreiter
0458115681
squid: update to 3.1.14.
2011-07-12 07:30:05 +02:00
Arne Fitzenreiter
27e5a01353
core50: stop/start services at update.
2011-07-12 00:11:49 +02:00
Michael Tremer
c894a34234
openvpnctrl: Disable debug mode.
2011-07-08 18:30:41 +02:00
Michael Tremer
91a0a2217a
openvpnctrl: Fix initialization of the program.
...
Firewall rules are now set properly and a detection for the
connection type was added.
2011-07-08 17:40:59 +02:00
Arne Fitzenreiter
6970b26252
started core51.
2011-07-07 22:03:12 +02:00
Arne Fitzenreiter
d52c593001
Merge branch 'master' into core50
2011-07-07 22:00:19 +02:00
Arne Fitzenreiter
fe8324f451
finished core50.
2011-07-07 21:59:50 +02:00
Arne Fitzenreiter
cbb914abe8
Merge branch 'master' into core50
...
Conflicts:
config/rootfiles/core/50/filelists/icons
2011-07-07 21:57:36 +02:00
Michael Tremer
3717a205a6
Merge branch 'static-routing' into next
2011-07-06 19:38:29 +02:00
Christian Schmidt
e1b8a85323
Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next
2011-07-06 19:30:11 +02:00
Christian Schmidt
a5b0d8bf9e
Added new routing cgi.
2011-07-06 19:29:36 +02:00
Michael Tremer
daf9669080
Add binary "rebuildroutes" to setup routes from the webif.
2011-07-05 19:11:23 +02:00
Michael Tremer
aba9ac599f
Update static routing script to actually add the routes.
2011-07-05 18:57:33 +02:00
Michael Tremer
1129c37a95
openvpnctrl: Fix SEGV in sprintf() call.
2011-07-05 12:45:51 +02:00
Arne Fitzenreiter
85cbc0a08f
ipsec: fix ike firewall rule to support nat traversal.
2011-07-04 23:09:05 +02:00
Arne Fitzenreiter
264c0195fb
ipsec: change grep for ikev2 status display.
2011-07-04 21:41:31 +02:00
Arne Fitzenreiter
ec238128df
Merge branch 'master' into next
2011-07-04 21:09:54 +02:00
Arne Fitzenreiter
10ad048dec
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
2011-07-04 21:06:10 +02:00
Arne Fitzenreiter
7180ae3897
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
2011-07-04 21:05:46 +02:00
Christian Schmidt
4912df2ff6
OutgoingFW Groups added syntax checks.
2011-07-04 19:36:53 +02:00
Arne Fitzenreiter
e8bae96337
Merge branch 'master' into next
2011-07-04 12:53:27 +02:00
Arne Fitzenreiter
b651a44dba
squid: update to 3.1.13.
2011-07-04 12:52:43 +02:00
Michael Tremer
61e1585f05
Drop reserved ports from the web GUI.
...
Recently, TCP/UDP ports 222 and 444 among others could not
be forwareded (DNAT) to another machine on the network.
This is unneccessary and now removed.
2011-07-03 17:49:21 +02:00
Arne Fitzenreiter
641baa86e0
ipsec: fix vpn-watch ikev2 skipping.
2011-07-03 15:36:44 +02:00
Arne Fitzenreiter
b26fa79a08
strongswan: force killing charon at ipsec stop if it not react to term.
2011-07-03 13:21:59 +02:00
Arne Fitzenreiter
3e077ef345
ipsec: add ikev2 down to ipseccrtl.
2011-07-03 11:21:49 +02:00
Arne Fitzenreiter
74459c0ade
Merge branch 'master' into next
2011-07-03 11:03:57 +02:00
Arne Fitzenreiter
edc2f9c4fd
core50: add databases to core update.
2011-07-03 11:03:04 +02:00
Arne Fitzenreiter
e529ac6f2c
hwdata: update pci and usb database.
2011-07-03 10:46:47 +02:00
Arne Fitzenreiter
0a8a2a4b2e
GeoIP: update database 1.7.2011.
2011-07-03 10:46:08 +02:00
Arne Fitzenreiter
0e14ef8a3b
logs.cgi: fix charon string for ipsec log.
2011-07-02 20:22:25 +02:00
Michael Tremer
bfd77eaf70
Initial commit for static routing.
...
Add script that initializes the routing table and is supposed to
set the routes.
2011-07-01 20:17:26 +02:00
Michael Tremer
7d653d51f8
openvpnctrl: Fix for while loop that had no break.
2011-07-01 19:40:44 +02:00
Arne Fitzenreiter
0f5490855a
kernel: disabled obsolete prism54 modul.
2011-06-30 22:09:11 +02:00
Michael Tremer
d4c8b6bec2
openvpnctrl: Remove PID file after an openvpn process was killed.
2011-06-29 20:02:31 +02:00
Michael Tremer
80ca8bd0f5
openvpnctrl: Fix some compiler warnings.
...
(Hopefully) no functional changes.
2011-06-29 19:58:01 +02:00
Michael Tremer
858d8d9092
openvpnctrl: Create firewall rules properly if roadwarrior server is disabled.
2011-06-29 19:51:24 +02:00
Arne Fitzenreiter
b751ad8181
Merge branch 'master' into next
2011-06-28 00:49:44 +02:00
Arne Fitzenreiter
ad8cad552b
core50: add graphs.pl.
2011-06-28 00:48:47 +02:00
Arne Fitzenreiter
1abbf741cc
load graph: fix unlocalized "minutes".
2011-06-28 00:46:48 +02:00
Arne Fitzenreiter
2aa5f6100d
smartmontools: update to 5.41.
2011-06-27 20:52:35 +02:00
Arne Fitzenreiter
5532265c3c
ipsec: add ike version connection table.
2011-06-26 23:18:32 +02:00
Arne Fitzenreiter
57ba1e9023
ipsec: change check if a ikev2 tunnel is up.
2011-06-26 23:16:41 +02:00
Arne Fitzenreiter
a3323b6fde
vpnmain.cgi: fix my typo.
2011-06-26 18:56:39 +02:00
Michael Tremer
117e37e356
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2011-06-26 18:09:03 +02:00