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
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
acb759575e
hostapd: update to 2.4
2015-04-11 22:03:03 +02:00
Arne Fitzenreiter
f3dce17984
wpa_supplicant: update to 2.4
2015-04-11 22:02:33 +02:00
Arne Fitzenreiter
0fbba54e82
Merge branch 'master' into next
...
Conflicts:
lfs/monit
2015-04-11 21:58:09 +02:00
Alexander Marx
c63e97bbaf
vpn-statistic: fix removal of rw rrd-data
...
Due to a missing slash the rrd data of a deleted rrd-connection was not
deleted
2015-04-11 08:33:19 +02:00
Alexander Marx
462056ad86
vpn-statistic: move collectd converter to the right place
...
Build of cdrom will fail if the converter script is not moved to the
right place
2015-04-11 08:33:02 +02:00
Alexander Marx
5c3b3bd8e1
vpn-statistic: fix alignment of graph legend for n2n graphs
2015-04-10 17:20:43 +02:00
Michael Tremer
1164cb0d0b
pound: Decrease the size of the DH key to 1024 bits
...
Generating a 2048 bit key takes way too long to be feasible
at build time.
2015-04-10 13:48:47 +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
831a5ef6ad
core89: Update OpenVPN configuration during the update
2015-04-10 13:16:33 +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
Stefan Schantl
054d584786
de.pl: Fix umlauts in GeoIP related strings.
...
This issue has been intruced in commit 0ff5b2b0ac
2015-04-09 18:14:48 +02:00
Michael Tremer
2f3e47a042
setup: Has been moved to /usr/sbin
...
The setup program has been moved from /usr/local/sbin/setup
to /usr/sbin/setup to comply better with FHS. The old copy
was left in the file system on updated systems and was
preferred when called from the shell which is not intended.
The old file is now removed and to make sure every system
has got the new file it is shipped once again.
2015-04-09 17:56:47 +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
