Commit Graph

7418 Commits

Author SHA1 Message Date
Alf Høgemark
c438fb070e en.pl: Trivial sorting of a key 2014-03-01 14:59:18 +01:00
Alf Høgemark
bde7a7d296 showrequestfromcountry.dat: Use language string, and fix links
Define language key for input field.
Fix links for older and newer links.
Indentation fixes.

The code is a copy from showrequestfromip.dat, ideally
we should have merged all three showrequestfrom*.dat files
into one file, but I do not do that now, because it would
really require a rewrite of most of the logic, and I understand
that one does not want to do such changes in 2.x.
2014-03-01 14:59:18 +01:00
Alf Høgemark
f424897557 firewalllogcountry.dat: Use language strings and add to menu
Add some language strings for the new firewalllogport.dat, and
include html fixes done in firewalllogip.dat, which this file
is based on.

Also try to add the menu item to the sub menu, but that is
currently not working.
2014-03-01 14:59:18 +01:00
Alf Høgemark
e4aac47370 logs.cgi: Add files for showing firewall blocks by country
Add similair functionality as firewalllogip.dat and
firewalllogport.dat, by listing the number of blocks
per country, and provide a details link to show only
the blocked ip addresses from the country.

This is a preliminary prototype.
2014-03-01 14:59:17 +01:00
Arne Fitzenreiter
c6f96750ba ffmpeg: prevent executable stack. 2014-02-28 16:09:45 +01:00
Arne Fitzenreiter
26685b0742 libmad: prevent executable stack. 2014-02-28 16:09:04 +01:00
Arne Fitzenreiter
82a4a102f3 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2014-02-28 07:04:45 +01:00
Arne Fitzenreiter
6887597c04 kernel: enable rts5139 driver. 2014-02-28 07:02:14 +01:00
Alexander Marx
800077a689 Firewall: Skip rules on boot when red has no ip 2014-02-27 19:42:47 +01:00
Michael Tremer
5a7491ffd6 QoS: Actually accept subnets everywhere. 2014-02-27 19:39:18 +01:00
Alexander Marx
5eee5a607e QOS: IP-Addresses can now be simple IP-Address or IP-Address and subnet 2014-02-27 19:12:06 +01:00
Michael Tremer
b18dba57de Merge remote-tracking branch 'alfh/feature_graph_constant_color' into next 2014-02-27 13:37:53 +01:00
Michael Tremer
015e243b0d Merge remote-tracking branch 'alfh/bugfix_openbox_center' into next 2014-02-27 13:36:38 +01:00
Michael Tremer
df6b9ebfbc openvpn: Provide a basic set of configuration settings.
These are the defaults as in the CGI script, but when you don't
set up the roadwarrior server, the configuration file remains
empty and the openvpnctrl binary will end itself because it cannot
read a proper configuration.
2014-02-27 13:32:13 +01:00
Michael Tremer
c9cd26f200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2014-02-27 13:14:02 +01:00
Arne Fitzenreiter
906d293b05 flash-images: work around a pandaboard uboot bug.
uboot does not find the kernel if it was copied to late to the
fat partition.
2014-02-27 12:46:14 +01:00
Arne Fitzenreiter
b3aa7a1231 ntp: wait only if wpa_supplicant is running. 2014-02-27 08:22:11 +01:00
Michael Tremer
55a5bcae74 firewall: Call firewallctrl with full path. 2014-02-26 20:03:32 +01:00
Michael Tremer
a8d1d049c6 Revert "Firewall: Fix errormessages on rulecreation when red has no IP"
This reverts commit f942937c29.

This completely destroys external access rules and is therefore
reverted.
2014-02-26 20:02:24 +01:00
Alf Høgemark
e06986e853 qos and process graphs: avoid random colors
For the graphs for qos classes, and for process
count and memory usage, the colors change on
each page reload, since the colors are currently
totally random.

This change uses defined color indexes, 15 different
ones, that should be enough for qos at least, and is
enough for processes on my setup. This makes
the colors consistent between page loads, so it makes
it easier to monitor changes.

Perhaps one should define 30 different colors meant
to be used for graphing, then one could avoid random
colors also for the sensor graphs, and make it less
likely to get color collision for the process graphs
as well. Defining 30 such colors is not part of this
change.
2014-02-26 18:48:05 +01:00
Alf Høgemark
480f354d89 ipfire theme: Use div align for center
Revert change to make openbox produce validating html,
when center alignment for box is wanted.

I have not been able to find css solution for
properly aligning the div horisontally.
2014-02-26 18:37:57 +01:00
Arne Fitzenreiter
329e9c465a kernel: enable cgroups and fix some accounting settings. 2014-02-26 18:06:49 +01:00
Arne Fitzenreiter
ce81f1eb3e kernel: enable pci modules in arm multiarch kernel. 2014-02-26 18:00:44 +01:00
Arne Fitzenreiter
adce3f96fc Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2014-02-26 17:59:53 +01:00
Michael Tremer
69776cc42f apache: Update cipher suite that is used for the web user interface.
Taken from here with exception of RC4.
  https://wiki.mozilla.org/Security/Server_Side_TLS#Apache
2014-02-26 15:01:29 +01:00
Arne Fitzenreiter
78f10eafe0 strongswan: no padlock on arm. 2014-02-26 09:37:12 +01:00
Alf Høgemark
c101827318 firewalllogs*.dat: Reduce amount of code to set row bgcolor
Replace 10 if statements with duplicated code for print
and setting background color by using a variable and
one if statement.
2014-02-25 22:03:40 +01:00
Michael Tremer
25bd6edaaf Merge remote-tracking branch 'alfh/feature_html_validating' into next 2014-02-25 22:02:34 +01:00
Michael Tremer
f2b8668fc8 Merge remote-tracking branch 'alfh/feature_qos_description' into next 2014-02-25 22:01:34 +01:00
Michael Tremer
50294f93c2 Merge remote-tracking branch 'alfh/feature_htmlclean_removefont' into next 2014-02-25 22:01:14 +01:00
Erik Kapfer
4e7c3114ca index.cgi: Add /red/local-ipaddress query.
Fixes# 10480. Added if loop for local-ipaddress query.
2014-02-25 21:57:55 +01:00
Michael Tremer
52ecb188bc Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2014-02-25 12:23:33 +01:00
Michael Tremer
66f6b279b0 Reload all firewall rules when /etc/init.d/firewall reload is executed. 2014-02-25 12:23:09 +01:00
Arne Fitzenreiter
a7c5afa453 kernel: update to 3.10.32. 2014-02-24 22:25:15 +01:00
Michael Tremer
22fd89c656 sshd: Fix warning that oom_adj is deprecated.
Also make startup faster.
2014-02-24 21:36:15 +01:00
Alexander Marx
f942937c29 Firewall: Fix errormessages on rulecreation when red has no IP 2014-02-24 19:39:39 +01:00
Alexander Marx
46a6d6c7fc Firewall: fix error when editing a rule and changing remark with invalid chars the rule was destroyed 2014-02-24 19:39:26 +01:00
Alexander Marx
97bf45e516 Firewall: delete -i red0 from DNAT rules 2014-02-24 19:38:57 +01:00
Alexander Marx
ec56a5393f Firewall: fixed padding-right of lastrule table in ruleoverview 2014-02-24 19:38:43 +01:00
Michael Tremer
585df65af1 Fix relocating NTP binaries. 2014-02-24 19:37:20 +01:00
Alexander Marx
525204e00f Firewall: modified DNAT and SNAT rulecreation 2014-02-24 11:54:27 +01:00
Stefan Schantl
37013b3a47 Add missing default values for firewall options of the new firewall.
The new firewall uses some new options which can be configured on the optionsfw page in the WUI.
In the past these settings where missing on updated systems.
2014-02-23 22:30:56 +01:00
Arne Fitzenreiter
0a79ec4505 ntp: check/wait for onlineconnection. 2014-02-23 18:28:34 +01:00
Alf Høgemark
c010871ab1 index.cgi: Make html valid, and improve dialup and vpn display
Make the html validate. One part of the changes is to
move style from using deprecated attributes to using
style attribute on tag.
The other part is to make sure that tables, rows and cells
are properly closed and nested.

Use a table for showing output from the dialctrl script.
2014-02-22 17:36:45 +01:00
Alf Høgemark
429c1a3fc9 connections.cgi: Make the html pass html validation 2014-02-22 17:36:45 +01:00
Alf Høgemark
d7fe5d7970 aliases.cgi: Make the html pass html validation 2014-02-22 17:36:45 +01:00
Alf Høgemark
0f43165084 ipfire theme: Fix align on div, and fix javascript tag
Remove align attribute on div for openbox, rather use
style attribute with text-align, since align attribute
causes html validation warnings, since it is deprecated.

Remove deprecated and useless attribute on javascript tag.
2014-02-22 17:35:46 +01:00
Alf Høgemark
8b40eca59e cgi-bin: Remove font tags with no effect, and style tags
The font tag is deprecated, so clean up html by removing
font tags that have no effect.

For font tags that have an effect, move the styling to
the tag controlling the text output.

The aim is to get one step further towards validating html.
2014-02-22 12:13:02 +01:00
Alf Høgemark
be7534e3fa qos.cgi: Show class description in listing, and graph description
When listing the defined qos classes when qos.cgi is initially
displayed, include the description of the class.

Add upload heading for red graph and download graph for imq graph,
since it is not obvious what the graphs means.
2014-02-22 07:07:57 +01:00
Michael Tremer
582fa15555 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2014-02-21 11:56:52 +01:00