Stefan Schantl
c4e106d181
Revert "Revert "perl-Locale-Country: Update country codes to version 3.33.""
...
This reverts commit cbc5a4374f
2015-04-21 19:16:26 +02:00
Stefan Schantl
b3c1c8342c
Revert "Revert roofile update for Locale-Country."
...
This reverts commit 91d6b6ef07
2015-04-21 19:16:03 +02:00
Stefan Schantl
0c89de6716
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-04-20 19:03:52 +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
Michael Tremer
1245aa72df
openssl: Fix build by updating the patches
2015-04-19 11:59:19 +02:00
Matthias Fischer
2805275ecc
openssl: Update to 1.0.2a
2015-04-19 11:29:02 +02:00
Stefan Schantl
dc127e0faa
Core 90: Add changed css files.
2015-04-19 01:23:18 +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
Stefan Schantl
f51bc66149
Core 90: Add changed ovpnmain.cgi.
2015-04-19 01:15:02 +02:00
Michael Tremer
fb245d5ec1
core90: Add changed vpnmain.cgi
2015-04-18 23:36:20 +02:00
Wolfgang Apolinarski
ab2d15486b
Added clientAuth to EKU of client certificate. Fixed the comment.
2015-04-18 23:32:14 +02:00
Michael Tremer
f14de8277a
xtables-addon: Build all matches and targets
2015-04-18 16:42:22 +02:00
Michael Tremer
0389942c2b
Update translations
2015-04-18 16:16:01 +02:00
Michael Tremer
49b70d62a9
Merge remote-tracking branch 'stevee/core-90-geoip' into next
2015-04-18 16:15:17 +02:00
Michael Tremer
d54a2ce452
dnsmasq: Import more patches from upstream
2015-04-18 16:11:29 +02:00
Stefan Schantl
db5b5de9a9
Core90: Update crontab.
2015-04-16 22:00:51 +02:00
Arne Fitzenreiter
4d9e31ab78
kernel: update to 3.14.38
2015-04-16 20:52:44 +02:00
Stefan Schantl
46d3a4cb16
Core90: Add GeoIP to update.
2015-04-16 20:37:00 +02:00
Stefan Schantl
b8fe6ca756
Roofile updates for GeoIP related files.
2015-04-16 19:40:53 +02:00
Stefan Schantl
30654fd82b
configroot: Add geoip related files.
...
Create required empty files and install geoip-functions.pl to
desired destination.
2015-04-16 19:39:11 +02:00
Stefan Schantl
cbc5a4374f
Revert "perl-Locale-Country: Update country codes to version 3.33."
...
This reverts commit bf235e962c
2015-04-16 10:51:44 +02:00
Stefan Schantl
91d6b6ef07
Revert roofile update for Locale-Country.
...
This reverts commit f2d941436b
2015-04-16 10:51:03 +02:00
Stefan Schantl
e6c4f090b6
Merge branch 'next-geoip' into core-90-geoip
2015-04-15 17:10:49 +02:00
Arne Fitzenreiter
30986dbf03
Merge remote-tracking branch 'origin/master' into next
2015-04-14 20:26:21 +02:00
Michael Tremer
c023275154
Update translations
2015-04-14 20:06:19 +02:00
Michael Tremer
6e8f58bf70
vpn-stats: Use more descriptive menu entry names
2015-04-14 20:05:32 +02:00
Arne Fitzenreiter
65f2c9bb39
Merge remote-tracking branch 'origin/master' into next
2015-04-14 17:59:21 +02:00
Arne Fitzenreiter
0778b991c9
start core90.
2015-04-14 17:07:27 +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
Alexander Marx
daf34294f2
vpn-statistic: update old n2n configs in update.sh
2015-04-13 15:46:45 +02:00
Michael Tremer
18bbd71bdc
collectd: Ignore any errors if openvpn status files are missing
2015-04-13 15:45:52 +02:00
Stefan Schantl
9673754385
backup: Include sshd config file.
...
The sshd config file was not included in the backups, so if the port
was switched from the default one to another one, the changed value was
correctly restored and displayed in the WUI but still the original sshd
config file was present and the default port has been used.
This issue is fixed by this commit.
Fixes #10446 .
2015-04-13 15:35:15 +02:00
Michael Tremer
b171633c7e
Merge remote-tracking branch 'amarx/BUG10796' into next
2015-04-13 12:17:53 +02:00
Michael Tremer
8d679040b7
core89: Move converter to the end because collectd should be restarted at last
2015-04-13 11:39:08 +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
Michael Tremer
9aeac09636
core89: Fix permissions of /var/ipfire/dns
2015-04-13 10:49:14 +02:00
Michael Tremer
01c82dbaa3
core89: Create temporary files in update to avoid reboot
2015-04-13 10:24:44 +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
abd93c4241
collectd: Ignore errors from OpenVPN configuration file
2015-04-12 22:44:50 +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
Michael Tremer
2784608227
core89: Fix permissions of collectd.vpn after update
2015-04-12 22:33:16 +02:00
Michael Tremer
d64471be04
core89: Do not add collectd include multiple times
2015-04-12 22:28:42 +02:00
Arne Fitzenreiter
040ec360f9
hostapd: remove MADWIFI from initskript
2015-04-11 22:23:31 +02:00
