people/pmueller/ipfire-2.x.git
4 years agoMerge remote-tracking branch 'origin/master' into next
Arne Fitzenreiter [Tue, 14 Apr 2015 18:26:21 +0000 (20:26 +0200)] 
Merge remote-tracking branch 'origin/master' into next

4 years agoUpdate translations
Michael Tremer [Tue, 14 Apr 2015 18:06:19 +0000 (20:06 +0200)] 
Update translations

4 years agovpn-stats: Use more descriptive menu entry names
Michael Tremer [Tue, 14 Apr 2015 18:05:32 +0000 (20:05 +0200)] 
vpn-stats: Use more descriptive menu entry names

4 years agoMerge remote-tracking branch 'origin/master' into next
Arne Fitzenreiter [Tue, 14 Apr 2015 15:59:21 +0000 (17:59 +0200)] 
Merge remote-tracking branch 'origin/master' into next

4 years agostart core90.
Arne Fitzenreiter [Tue, 14 Apr 2015 08:27:17 +0000 (10:27 +0200)] 
start core90.

4 years agovpn-statistic: add URI::escape for openvpn names with special chars
Alexander Marx [Mon, 13 Apr 2015 14:26:48 +0000 (16:26 +0200)] 
vpn-statistic: add URI::escape for openvpn names with special chars

4 years agovpn-statistic: add collectd parameters to imported n2n packages
Alexander Marx [Tue, 14 Apr 2015 09:53:28 +0000 (11:53 +0200)] 
vpn-statistic: add collectd parameters to imported n2n packages

4 years agoMerge remote-tracking branch 'origin/master' into next
Arne Fitzenreiter [Mon, 13 Apr 2015 15:11:41 +0000 (17:11 +0200)] 
Merge remote-tracking branch 'origin/master' into next

4 years agovpn-statistic: update old n2n configs in update.sh
Alexander Marx [Mon, 13 Apr 2015 13:03:17 +0000 (15:03 +0200)] 
vpn-statistic: update old n2n configs in update.sh

4 years agocollectd: Ignore any errors if openvpn status files are missing
Michael Tremer [Mon, 13 Apr 2015 13:45:52 +0000 (15:45 +0200)] 
collectd: Ignore any errors if openvpn status files are missing

4 years agobackup: Include sshd config file.
Stefan Schantl [Mon, 13 Apr 2015 13:35:15 +0000 (15:35 +0200)] 
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.

4 years agoMerge remote-tracking branch 'amarx/BUG10796' into next
Michael Tremer [Mon, 13 Apr 2015 10:17:53 +0000 (12:17 +0200)] 
Merge remote-tracking branch 'amarx/BUG10796' into next

4 years agocore89: Move converter to the end because collectd should be restarted at last
Michael Tremer [Mon, 13 Apr 2015 09:39:08 +0000 (11:39 +0200)] 
core89: Move converter to the end because collectd should be restarted at last

4 years agoMerge remote-tracking branch 'amarx/BUG10797' into next
Michael Tremer [Mon, 13 Apr 2015 09:28:57 +0000 (11:28 +0200)] 
Merge remote-tracking branch 'amarx/BUG10797' into next

4 years agovpn-stats: Show daily graph as *all* other graphs do, too
Michael Tremer [Mon, 13 Apr 2015 08:57:09 +0000 (10:57 +0200)] 
vpn-stats: Show daily graph as *all* other graphs do, too

4 years agocore89: Fix permissions of /var/ipfire/dns
Michael Tremer [Mon, 13 Apr 2015 08:49:14 +0000 (10:49 +0200)] 
core89: Fix permissions of /var/ipfire/dns

4 years agocore89: Create temporary files in update to avoid reboot
Michael Tremer [Mon, 13 Apr 2015 08:24:44 +0000 (10:24 +0200)] 
core89: Create temporary files in update to avoid reboot

4 years agoBUG10797: Fix addontable in services.cgi when using squid-accounting addon
Alexander Marx [Mon, 13 Apr 2015 06:36:00 +0000 (08:36 +0200)] 
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.

4 years agoBUG10796: Fix textoutput when doing pakfire update in WebUI
Alexander Marx [Mon, 13 Apr 2015 05:52:25 +0000 (07:52 +0200)] 
BUG10796: Fix textoutput when doing pakfire update in WebUI

4 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Stefan Schantl [Sun, 12 Apr 2015 21:23:40 +0000 (23:23 +0200)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

4 years agoovpnmain.cgi: Fix layout of CA related elements.
Stefan Schantl [Sun, 12 Apr 2015 21:18:11 +0000 (23:18 +0200)] 
ovpnmain.cgi: Fix layout of CA related elements.

Those elements where displayed out of the main box in the past.

4 years agoMerge remote-tracking branch 'origin/master' into next
Arne Fitzenreiter [Sun, 12 Apr 2015 20:53:06 +0000 (22:53 +0200)] 
Merge remote-tracking branch 'origin/master' into next

4 years agocollectd: Ignore errors from OpenVPN configuration file
Michael Tremer [Sun, 12 Apr 2015 20:44:50 +0000 (22:44 +0200)] 
collectd: Ignore errors from OpenVPN configuration file

4 years agoovpnmain.cgi: Remove DDEVICE setting
Michael Tremer [Sun, 12 Apr 2015 20:33:41 +0000 (22:33 +0200)] 
ovpnmain.cgi: Remove DDEVICE setting

This was used to select a TUN or TAP device from which TAP
was never supported anyway.

4 years agocore89: Fix permissions of collectd.vpn after update
Michael Tremer [Sun, 12 Apr 2015 20:33:16 +0000 (22:33 +0200)] 
core89: Fix permissions of collectd.vpn after update

4 years agocore89: Do not add collectd include multiple times
Michael Tremer [Sun, 12 Apr 2015 20:28:42 +0000 (22:28 +0200)] 
core89: Do not add collectd include multiple times

4 years agohostapd: remove MADWIFI from initskript
Arne Fitzenreiter [Sat, 11 Apr 2015 20:23:31 +0000 (22:23 +0200)] 
hostapd: remove MADWIFI from initskript

4 years agowlansp.cgi: remove MADWIFI functions.
Arne Fitzenreiter [Sat, 11 Apr 2015 20:18:26 +0000 (22:18 +0200)] 
wlansp.cgi: remove MADWIFI functions.

4 years agowlanap.cgi: hide "no IR" channels
Arne Fitzenreiter [Sat, 11 Apr 2015 20:09:18 +0000 (22:09 +0200)] 
wlanap.cgi: hide "no IR" channels

4 years agohostapd: update to 2.4
Arne Fitzenreiter [Sat, 11 Apr 2015 20:03:03 +0000 (22:03 +0200)] 
hostapd: update to 2.4

4 years agowpa_supplicant: update to 2.4
Arne Fitzenreiter [Sat, 11 Apr 2015 20:02:33 +0000 (22:02 +0200)] 
wpa_supplicant: update to 2.4

4 years agoMerge branch 'master' into next
Arne Fitzenreiter [Sat, 11 Apr 2015 19:58:09 +0000 (21:58 +0200)] 
Merge branch 'master' into next

Conflicts:
lfs/monit

4 years agovpn-statistic: fix removal of rw rrd-data
Alexander Marx [Sat, 11 Apr 2015 05:12:32 +0000 (07:12 +0200)] 
vpn-statistic: fix removal of rw rrd-data

Due to a missing slash the rrd data of a deleted rrd-connection was not
deleted

4 years agovpn-statistic: move collectd converter to the right place
Alexander Marx [Sat, 11 Apr 2015 03:34:34 +0000 (05:34 +0200)] 
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

4 years agovpn-statistic: fix alignment of graph legend for n2n graphs
Alexander Marx [Fri, 10 Apr 2015 13:47:10 +0000 (15:47 +0200)] 
vpn-statistic: fix alignment of graph legend for n2n graphs

4 years agopound: Decrease the size of the DH key to 1024 bits
Michael Tremer [Fri, 10 Apr 2015 11:48:47 +0000 (13:48 +0200)] 
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.

4 years agoopenvpn: Stop N2N connections before they are removed
Michael Tremer [Fri, 10 Apr 2015 11:32:48 +0000 (13:32 +0200)] 
openvpn: Stop N2N connections before they are removed

4 years agoopenvpn: Move remving files in /var/run to openvpnctrl
Michael Tremer [Fri, 10 Apr 2015 11:27:32 +0000 (13:27 +0200)] 
openvpn: Move remving files in /var/run to openvpnctrl

4 years agocore89: Update OpenVPN configuration during the update
Alexander Marx [Fri, 10 Apr 2015 11:16:33 +0000 (13:16 +0200)] 
core89: Update OpenVPN configuration during the update

4 years agoovpnmain.cgi: Remove duplicate code to remove a connection
Alexander Marx [Fri, 10 Apr 2015 11:13:02 +0000 (13:13 +0200)] 
ovpnmain.cgi: Remove duplicate code to remove a connection

4 years agoovpnmain.cgi: Fix indentation and code cleanup
Alexander Marx [Fri, 10 Apr 2015 11:12:14 +0000 (13:12 +0200)] 
ovpnmain.cgi: Fix indentation and code cleanup

No functional change

4 years agosetup: Has been moved to /usr/sbin
Michael Tremer [Thu, 9 Apr 2015 15:56:47 +0000 (17:56 +0200)] 
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.

4 years agovpn-statistic: change title of ovpn n2n site
Alexander Marx [Wed, 8 Apr 2015 17:53:17 +0000 (19:53 +0200)] 
vpn-statistic: change title of ovpn n2n site

additionally print errormessages to /dev/null when no rrd data is found

4 years agoopenvpn: Remove stat files when connections are removed
Michael Tremer [Thu, 9 Apr 2015 15:18:44 +0000 (17:18 +0200)] 
openvpn: Remove stat files when connections are removed

4 years agoopenvpn: Remove RRDs when removing all connections at once
Michael Tremer [Thu, 9 Apr 2015 15:11:16 +0000 (17:11 +0200)] 
openvpn: Remove RRDs when removing all connections at once

4 years agoopenvpn: Update collectd configuration when connections are started/stopped
Alexander Marx [Thu, 9 Apr 2015 14:44:07 +0000 (16:44 +0200)] 
openvpn: Update collectd configuration when connections are started/stopped

4 years agoopenvpn: Properly remove all RRDs after a connection is removed
Michael Tremer [Thu, 9 Apr 2015 14:32:39 +0000 (16:32 +0200)] 
openvpn: Properly remove all RRDs after a connection is removed

4 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Thu, 9 Apr 2015 13:36:45 +0000 (15:36 +0200)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

4 years agostrongswan: Rootfile update
Michael Tremer [Thu, 9 Apr 2015 13:36:27 +0000 (15:36 +0200)] 
strongswan: Rootfile update

4 years agobackports: rt2x00 supress more queue warnings
Arne Fitzenreiter [Thu, 9 Apr 2015 13:34:14 +0000 (15:34 +0200)] 
backports: rt2x00 supress more queue warnings

4 years agohostapd: increase EAPOL timeouts
Arne Fitzenreiter [Thu, 9 Apr 2015 13:32:42 +0000 (15:32 +0200)] 
hostapd: increase EAPOL timeouts

Android clients need more time because sleep modes and low wlan interrupt priority.

4 years agostrongswan: rootfile update
Arne Fitzenreiter [Thu, 9 Apr 2015 13:29:25 +0000 (15:29 +0200)] 
strongswan: rootfile update

4 years agovpn-statistic: move collectd.vpn to /var/ipfire/ovpn/
Alexander Marx [Wed, 8 Apr 2015 17:20:13 +0000 (19:20 +0200)] 
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.

4 years agovpn-statistic: create collectd wrapper to restart collectd when first vpn was created
Alexander Marx [Tue, 7 Apr 2015 13:35:31 +0000 (15:35 +0200)] 
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

4 years agovpn-statistic: change title of ovpn RW statistic page
Alexander Marx [Wed, 8 Apr 2015 17:50:56 +0000 (19:50 +0200)] 
vpn-statistic: change title of ovpn RW statistic page

additionally print errors to /dev/null if no rrd data is found

4 years agovpn-statistic: added title for graph sites
Alexander Marx [Wed, 8 Apr 2015 17:47:51 +0000 (19:47 +0200)] 
vpn-statistic: added title for graph sites

4 years agoBUG10790: create dummy ovpnserver.log in /var/run
Alexander Marx [Tue, 7 Apr 2015 13:22:46 +0000 (15:22 +0200)] 
BUG10790: create dummy ovpnserver.log in /var/run

4 years agodnsmasq: fix initskript
Arne Fitzenreiter [Tue, 31 Mar 2015 08:09:46 +0000 (10:09 +0200)] 
dnsmasq: fix initskript

-add timestamp filename
-pull user config after define default parameter

4 years agohaproxy: Provide a better example configuration that works
Michael Tremer [Sat, 4 Apr 2015 12:38:38 +0000 (14:38 +0200)] 
haproxy: Provide a better example configuration that works

4 years agodnsmasq: Import latest patches from upstream
Michael Tremer [Sat, 4 Apr 2015 13:23:17 +0000 (15:23 +0200)] 
dnsmasq: Import latest patches from upstream

4 years agocollectd: Fix typo in "derive"
Michael Tremer [Thu, 9 Apr 2015 12:33:54 +0000 (14:33 +0200)] 
collectd: Fix typo in "derive"

4 years agoMerge remote-tracking branch 'earl/tor' into next
Michael Tremer [Wed, 8 Apr 2015 20:47:32 +0000 (22:47 +0200)] 
Merge remote-tracking branch 'earl/tor' into next

4 years agotor: update to 0.2.5.12
Jan Paul Tuecking [Wed, 8 Apr 2015 05:45:16 +0000 (07:45 +0200)] 
tor: update to 0.2.5.12

4 years agocore89: Add openvpnctrl to updater
Michael Tremer [Tue, 7 Apr 2015 18:52:34 +0000 (20:52 +0200)] 
core89: Add openvpnctrl to updater

4 years agoMerge remote-tracking branch 'earl/tor' into next
Michael Tremer [Sun, 5 Apr 2015 10:38:51 +0000 (12:38 +0200)] 
Merge remote-tracking branch 'earl/tor' into next

4 years agodnsmasq: Import latest patches from upstream
Michael Tremer [Sat, 4 Apr 2015 13:23:17 +0000 (15:23 +0200)] 
dnsmasq: Import latest patches from upstream

4 years agohaproxy: Provide a better example configuration that works
Michael Tremer [Sat, 4 Apr 2015 12:38:38 +0000 (14:38 +0200)] 
haproxy: Provide a better example configuration that works

4 years agomont addon: added missing dir /var/lib/monit to distribution
Dirk Wagner [Sun, 22 Mar 2015 21:33:30 +0000 (22:33 +0100)] 
mont addon: added missing dir /var/lib/monit to distribution

Conflicts:
lfs/monit

4 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Sat, 4 Apr 2015 12:17:12 +0000 (14:17 +0200)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

4 years agoMerge remote-tracking branch 'glotzi/monit' into next
Michael Tremer [Sat, 4 Apr 2015 12:14:19 +0000 (14:14 +0200)] 
Merge remote-tracking branch 'glotzi/monit' into next

4 years agoMerge remote-tracking branch 'glotzi/asterisk-update' into next
Michael Tremer [Sat, 4 Apr 2015 12:12:53 +0000 (14:12 +0200)] 
Merge remote-tracking branch 'glotzi/asterisk-update' into next

4 years agonfs-server: Drop kernel version check from initscript.
Stefan Schantl [Sat, 4 Apr 2015 11:59:11 +0000 (13:59 +0200)] 
nfs-server: Drop kernel version check from initscript.

As suggested on the bugtracker, the kernel version check completely has been
removed.

Fixes #10760.

4 years agoUpdate translations
Michael Tremer [Sat, 4 Apr 2015 11:17:34 +0000 (13:17 +0200)] 
Update translations

4 years agoMerge branch 'nfs-server-fix' into next
Stefan Schantl [Fri, 3 Apr 2015 17:19:34 +0000 (19:19 +0200)] 
Merge branch 'nfs-server-fix' into next

4 years agonfs-server: Fix kernel version check in initscript.
Stefan Schantl [Fri, 3 Apr 2015 16:59:12 +0000 (18:59 +0200)] 
nfs-server: Fix kernel version check in initscript.

nfsd requires a mounted nfsd filesystem which has been introduced in
the kernel 2.6 tree. To determine the current running kernel, a check
was included in the initscript which works fine until we switched to a kernel
version 3.x.

This commit fixes this check, so the nfs-server will startup again.

Fixes #10760.

4 years agotor: update to 0.2.5.11
Jan Paul Tuecking [Fri, 3 Apr 2015 01:05:24 +0000 (03:05 +0200)] 
tor: update to 0.2.5.11

4 years agodnsmasq: fix initskript
Arne Fitzenreiter [Tue, 31 Mar 2015 08:09:46 +0000 (10:09 +0200)] 
dnsmasq: fix initskript

-add timestamp filename
-pull user config after define default parameter

4 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Mon, 30 Mar 2015 22:59:59 +0000 (00:59 +0200)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

4 years agostrongswan: Update to 5.3.0
Michael Tremer [Mon, 30 Mar 2015 22:55:21 +0000 (00:55 +0200)] 
strongswan: Update to 5.3.0

Enable support for CCM and CTR

4 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Mon, 30 Mar 2015 22:55:47 +0000 (00:55 +0200)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

4 years agostrongswan: Update to 5.3.0
Michael Tremer [Mon, 30 Mar 2015 22:55:21 +0000 (00:55 +0200)] 
strongswan: Update to 5.3.0

Enable support for CCM and CTR

4 years agorootfile update: apache2 cyrus-sasl logrotate
Arne Fitzenreiter [Mon, 30 Mar 2015 18:30:03 +0000 (20:30 +0200)] 
rootfile update: apache2 cyrus-sasl logrotate

4 years agoinstaller: add option to disable grafic mode for grub.
Arne Fitzenreiter [Mon, 30 Mar 2015 11:11:40 +0000 (13:11 +0200)] 
installer: add option to disable grafic mode for grub.

add novga to kernel commandline for the installer to add
GFXMODE="none" to /etc/default/grub.

4 years agokernel: backports: rt2800usb: suppress more queue warnings
Arne Fitzenreiter [Sun, 29 Mar 2015 20:43:56 +0000 (22:43 +0200)] 
kernel: backports: rt2800usb: suppress more queue warnings

4 years agokernel: fix hyperv net driver for legacy hyperv 2008.
Arne Fitzenreiter [Sun, 29 Mar 2015 17:46:14 +0000 (19:46 +0200)] 
kernel: fix hyperv net driver for legacy hyperv 2008.

4 years agokernel: disable igb vendor modul build
Arne Fitzenreiter [Sun, 29 Mar 2015 17:38:12 +0000 (19:38 +0200)] 
kernel: disable igb vendor modul build

the igb that is included to driver backports seems to be better.

4 years agoMerge remote-tracking branch 'origin/next' into kernel-test
Arne Fitzenreiter [Sun, 29 Mar 2015 17:33:04 +0000 (19:33 +0200)] 
Merge remote-tracking branch 'origin/next' into kernel-test

Conflicts:
lfs/openssl-compat

4 years agokernel: update to 3.14.37
Arne Fitzenreiter [Sun, 29 Mar 2015 17:29:55 +0000 (19:29 +0200)] 
kernel: update to 3.14.37

4 years agotar: fix toolchain build
Arne Fitzenreiter [Sun, 29 Mar 2015 11:35:16 +0000 (13:35 +0200)] 
tar: fix toolchain build

4 years agoAllow flash-images to compile on Ubuntu: delay to allow automount/dismount
Justin Luth [Sat, 28 Mar 2015 09:39:47 +0000 (12:39 +0300)] 
Allow flash-images to compile on Ubuntu: delay to allow automount/dismount

4 years agomont addon: added missing dir /var/lib/monit to distribution
Dirk Wagner [Sun, 22 Mar 2015 21:33:30 +0000 (22:33 +0100)] 
mont addon: added missing dir /var/lib/monit to distribution

4 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
Dirk Wagner [Sun, 22 Mar 2015 17:39:26 +0000 (18:39 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

4 years agoddns.cgi: Drop code for proto handling.
Stefan Schantl [Fri, 20 Mar 2015 17:53:44 +0000 (18:53 +0100)] 
ddns.cgi: Drop code for proto handling.

4 years agoset version to IPFire-2.17 core89
Arne Fitzenreiter [Fri, 20 Mar 2015 10:20:45 +0000 (11:20 +0100)] 
set version to IPFire-2.17 core89

4 years agoopenssl: Fix soname version of build
Arne Fitzenreiter [Thu, 19 Mar 2015 18:16:33 +0000 (19:16 +0100)] 
openssl: Fix soname version of build

4 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Arne Fitzenreiter [Thu, 19 Mar 2015 18:19:32 +0000 (19:19 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

4 years agocyrus-sasl: Update to version 2.1.26
Arne Fitzenreiter [Thu, 19 Mar 2015 18:18:49 +0000 (19:18 +0100)] 
cyrus-sasl: Update to version 2.1.26

4 years agoapache2: Update to version 2.2.29
Arne Fitzenreiter [Thu, 19 Mar 2015 18:18:23 +0000 (19:18 +0100)] 
apache2: Update to version 2.2.29

4 years agoopenssl: Rebase "disable SSLv2, SSLv3" patch
Michael Tremer [Thu, 19 Mar 2015 15:04:35 +0000 (16:04 +0100)] 
openssl: Rebase "disable SSLv2, SSLv3" patch

4 years agoopenssl: Remove "fix parallel build" patch
Michael Tremer [Thu, 19 Mar 2015 15:03:58 +0000 (16:03 +0100)] 
openssl: Remove "fix parallel build" patch