Stefan Schantl
dfbee171cc
geoip-functions: Adjust for new flag-icons and usage of "unknown" icon.
2015-05-04 20:13:52 +02:00
Stefan Schantl
b013822b99
Rename Locale::Country to Locale::Codes::Country in various scripts.
...
The new Locale-Country version needs to be loaded and used by specifing
Locale::Codes::Country since an upstream API change. Adjusting various perl
scripts to use the module in the proper way again.
2015-04-22 18:18:38 +02:00
Stefan Schantl
a54ec49e18
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-04-21 19:20: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
Arne Fitzenreiter
0505af9dc0
rules.pl: fix geoip initialisation.
2015-04-20 23:14:11 +02:00
Arne Fitzenreiter
785c919520
remove ipp2p patches.
...
ipp2p is build by xtables addons now.
2015-04-20 22:57:24 +02:00
Arne Fitzenreiter
2e28ecea3e
functions.network: update dhcp client commandline.
...
this fix trailing space before hostname.
2015-04-20 22:48:46 +02:00
Stefan Schantl
dc127e0faa
Core 90: Add changed css files.
2015-04-19 01:23:18 +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
Michael Tremer
f14de8277a
xtables-addon: Build all matches and targets
2015-04-18 16:42:22 +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
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
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
6e8f58bf70
vpn-stats: Use more descriptive menu entry names
2015-04-14 20:05:32 +02:00
Arne Fitzenreiter
0778b991c9
start core90.
2015-04-14 17:07:27 +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
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
8d679040b7
core89: Move converter to the end because collectd should be restarted at last
2015-04-13 11:39:08 +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
Arne Fitzenreiter
d4ee6f0813
Merge remote-tracking branch 'origin/master' into next
2015-04-12 22:53:06 +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
acb759575e
hostapd: update to 2.4
2015-04-11 22:03:03 +02:00
Arne Fitzenreiter
0fbba54e82
Merge branch 'master' into next
...
Conflicts:
lfs/monit
2015-04-11 21:58:09 +02:00
Alexander Marx
5c3b3bd8e1
vpn-statistic: fix alignment of graph legend for n2n graphs
2015-04-10 17:20:43 +02:00
Alexander Marx
831a5ef6ad
core89: Update OpenVPN configuration during the update
2015-04-10 13:16:33 +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
Arne Fitzenreiter
0f3d0cec24
strongswan: rootfile update
2015-04-09 15:29:25 +02:00
Alexander Marx
6b7cbc8f33
vpn-statistic: move collectd.vpn to /var/ipfire/ovpn/
...
collectd.vpn needs to be within /var/ipfire/ovpn so that the
ovpnmain.cgi is able to write the status files from the n2n connections
to the file.
2015-04-09 15:16:32 +02:00
Alexander Marx
91c2eaec9a
vpn-statistic: create collectd wrapper to restart collectd when first vpn was created
...
This wrapper is only used, when the first openvpn RW is created. Then
the collectd has to be restarted to get the vpn Data and create rrd Data
2015-04-09 14:59:26 +02:00
Alexander Marx
7ca64c9f0b
BUG10790: create dummy ovpnserver.log in /var/run
2015-04-09 14:43:12 +02:00
Michael Tremer
b525629a46
haproxy: Provide a better example configuration that works
2015-04-09 14:35:54 +02:00
Michael Tremer
eb3c6c47ca
core89: Add openvpnctrl to updater
2015-04-07 20:52:34 +02:00
Michael Tremer
15847a8001
Merge remote-tracking branch 'earl/tor' into next
2015-04-05 12:38:51 +02:00
Michael Tremer
b0b61056a7
haproxy: Provide a better example configuration that works
2015-04-04 14:38:38 +02:00
Dirk Wagner
29268dee3b
mont addon: added missing dir /var/lib/monit to distribution
...
Conflicts:
lfs/monit
2015-04-04 14:18:00 +02:00
Michael Tremer
6b6730a95f
Merge remote-tracking branch 'glotzi/monit' into next
2015-04-04 14:14:19 +02:00
Jan Paul Tuecking
79b269802d
tor: update to 0.2.5.11
2015-04-03 03:05:24 +02:00
Stefan Schantl
ef4edcfb20
crontab: Fix syntax for xt_geoip_update call.
2015-04-01 20:29:00 +02:00
Stefan Schantl
64d886f53f
crontab: Call xt_geoip_update random once a month.
2015-03-31 19:44:09 +02:00
Michael Tremer
6ecbdec1b7
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-03-31 00:59:59 +02:00
Michael Tremer
df5fbff531
strongswan: Update to 5.3.0
...
Enable support for CCM and CTR
2015-03-31 00:59:28 +02:00
