Commit Graph

25172 Commits

Author SHA1 Message Date
Renato Botelho
830ceadf02 Remove -U from mtree call used to restore files permissions, this is replacing symlink targets by the old values. Ticket #4328 2015-03-11 17:46:54 -03:00
Renato Botelho
b33f69c4c0 Merge pull request #1547 from phil-davis/Code-Style-etc-inc-vwx3 2015-03-11 17:42:40 -03:00
Renato Botelho
c14781e3c0 Save vip interface and subnet to use to delete old vips from secondary nodes. Fixes #4446 2015-03-11 16:02:47 -03:00
Renato Botelho
04bbb3a588 Revert "Use a consistent variable name here. related to Ticket #4446"
This reverts commit 309162b96d.
2015-03-11 16:02:47 -03:00
Chris Buechler
24dadbee06 add granular control of state timeouts. Ticket #4509
Conflicts:
	etc/inc/filter.inc
2015-03-11 13:29:44 -05:00
Renato Botelho
0d443728d5 Explicit disable ssl.use-compression on lighty config. It should fix #4230 2015-03-11 14:09:22 -03:00
Renato Botelho
3a0a59c812 Remove BEAST protection option since default cipher is now good and works with hifn cards 2015-03-11 14:03:29 -03:00
Renato Botelho
e75c2bf512 Revert "Enable beast protection by default for new installations, there is a code in place to disable it when a hifn card is present"
This reverts commit 23645bf703.
2015-03-11 13:55:42 -03:00
Renato Botelho
87bf8d4d0e Revert "Remove double // on config tag"
This reverts commit 8df86e1fc6.
2015-03-11 13:55:39 -03:00
Renato Botelho
8df86e1fc6 Remove double // on config tag
Spotted by:	BBCan177
2015-03-11 13:51:40 -03:00
Phil Davis
04e95a18ed Merge branch 'master' into Code-Style-etc-inc-vwx3
Conflicts:
	etc/inc/vpn.inc
2015-03-11 21:23:50 +05:45
Renato Botelho
a03974a3fa Add a log message when hostres SNMP module is ignored on APU boards 2015-03-11 10:07:25 -03:00
Renato Botelho
05036071e2 Disable SNMP hostres module on APU boards until we figure out why it's crashing on this specific board. Ticket #4403 2015-03-11 09:44:27 -03:00
Renato Botelho
18017c9c44 Merge pull request #1549 from phil-davis/patch-2 2015-03-11 08:30:56 -03:00
Renato Botelho
26ca0fd080 Merge pull request #1550 from phil-davis/password-lock-symbol 2015-03-11 08:29:43 -03:00
Renato Botelho
b776b3e0d5 Merge pull request #1548 from phil-davis/pencils 2015-03-11 08:28:23 -03:00
Renato Botelho
23645bf703 Enable beast protection by default for new installations, there is a code in place to disable it when a hifn card is present 2015-03-11 08:28:15 -03:00
Chris Buechler
e99affae86 update description after adaptive start/end default change. 2015-03-11 01:37:27 -05:00
Chris Buechler
80dfff9a2b Leave adaptive.start and end at their defaults (60% and 120% of the state limit, respectively) if not user-overridden. 2015-03-11 01:30:14 -05:00
Chris Buechler
0f57551162 Update cipher-list in web interface to prefer PFS. Ticket #4230 2015-03-11 00:25:56 -05:00
Chris Buechler
23cb405565 Check for not up, rather than down, as there are a variety of potential
statuses that are not up. Ticket #4502
2015-03-10 20:21:09 -05:00
Chris Buechler
34ba4e5d32 Need global $ipsec_idhandling here. 2015-03-10 19:20:16 -05:00
Chris Buechler
309162b96d Use a consistent variable name here. related to Ticket #4446
Conflicts:
	usr/local/www/xmlrpc.php
2015-03-10 19:01:35 -05:00
Chris Buechler
24acc8f466 Don't enable interfaces_use by default. Add checkbox to enable on Advanced
tab, in case there are scenarios where it's desirable. Ticket #4341
2015-03-10 17:20:42 -05:00
Ermal LUÇI
30ea15dc63 Fixes #4427 Correct traffic shaper wizard to properly save and use Voip provided settings 2015-03-10 21:47:06 +01:00
Ermal LUÇI
0a0978d78f Fixes #4427 Correct traffic shaper wizard to properly save and use Voip provided settings 2015-03-10 21:45:03 +01:00
Phil Davis
6787723455 Fix password box cursor position
Similar to
dedc40f7de
The password field shows the little lock icon, but the text input area
starts over the top of the icon and as I type in the field the password
"dots" go over the lock icon in each of these data entry places.
Changing the field name/id to not be "password" but to be "passwordfld",
"passwordfld1" "passwordfld2" and the like fixes it. Something does not
like the field being called just "password".
In interfaces.php I also changed the field "username" to be
"ppp_username". This standardized it to work in a similar way to
pppoe_username pptp_username fields. It looks easier to understand for
me.
2015-03-10 22:55:39 +05:45
Phil Davis
3853b43613 Fix SNMP Bind Interface list in master
The format of the array returned by get_possible_listen_ips() was changed.
This use of the returned array was not quite changed correctly. This fixes it so the drop-down list of SNMP Bind Interfaces is displayed correctly.
Note that the change to get_possible_listen_ips() (which also moved the function from system.inc to interfaces.inc) and associated effects is only in master. It has not been applied to RELENG_2_2 yet. So this fix is only needed in master.
I noticed this when using various files from master on a test system.
2015-03-10 20:27:11 +05:45
Ermal LUÇI
6127c541cc Revert "Fixes #4446 Correct ipalias removal on top of carp during configuration sync."
master works differently and get_real_interface() resolves vips as well.

This reverts commit 8896fe1ceb.
2015-03-09 19:01:40 +01:00
Ermal LUÇI
8896fe1ceb Fixes #4446 Correct ipalias removal on top of carp during configuration sync. 2015-03-09 18:52:23 +01:00
Phil Davis
e185c5846a Pencil symbols
These are places in the GUI where the cursor sits not in the far left
side of the input box and there is odd-looking white space to the left
of the cursor. Normally there would be a little input graphic in the
white space to the left of the cursor (a pencil, a computer screen, a
lock symbol...)
This change makes the pencil be displayed in all those places.
2015-03-09 22:55:18 +05:45
Phil Davis
7926283050 Code style etc inc vwx3
rebased version with conflicts resolved due to a bunch of recent changes
in vpn.inc
2015-03-09 14:06:24 -03:00
jim-p
261f727120 Allow reassignment from PPP types to DHCP. From testing, it appears to work OK, this input validation appears to be outdated.
If there is some edge case that this catches, perhaps it needs to be a more specific test.
2015-03-09 10:36:12 -04:00
jim-p
5bd0ba3e5d Add missing 'break' statement that broke switching from a PPP type to 'none'. 2015-03-09 10:22:48 -04:00
Phil Davis
fc4e8df89e Code style etc inc vwx3
rebased version with conflicts resolved due to a bunch of recent changes
in vpn.inc
2015-03-09 17:20:36 +05:45
Renato Botelho
2385106ec9 Merge pull request #1544 from phil-davis/patch-4 2015-03-09 07:00:58 -03:00
Renato Botelho
ad42e4d8c9 Merge pull request #1542 from phil-davis/patch-2 2015-03-09 06:59:51 -03:00
Renato Botelho
7ac524dd18 Merge pull request #1541 from phil-davis/Code-Style-etc-inc-z 2015-03-09 06:59:14 -03:00
Renato Botelho
aeaf63f103 Merge pull request #1545 from k-paulius/fix-syntax 2015-03-09 06:53:46 -03:00
k-paulius
ef1dfb8873 Add missing opening bracket 2015-03-08 18:17:26 -05:00
k-paulius
10192c3041 Remove extra closing brackets 2015-03-08 18:15:03 -05:00
k-paulius
29257358e7 $ldescr variable is not assigned a value and all 'Outgoing Network Interfaces' show Localhost as a name on UI 2015-03-08 18:07:32 -05:00
k-paulius
ec07dcfe94 Missing $ 2015-03-08 18:04:48 -05:00
Chris Buechler
51b24a30a8 Update help to current config structure, touch up text while here. Fixes #4492 2015-03-08 00:43:23 -06:00
Chris Buechler
08af94cb89 Check for console="comconsole* rather than just *comconsole* in loader.conf, so it doesn't match just having comconsole_speed in loader.conf. Ticket #4464 2015-03-07 14:16:14 -06:00
jim-p
0a4fbd990e Expand CARP demotion error, add button to reset demotion status. 2015-03-06 15:00:47 -05:00
Renato Botelho
588d3cf606 Check if it's an array before call foreach(). Ticket 2015-03-06 11:45:36 -03:00
Renato Botelho
b93bc1fd49 Stop trying to fix dns_split during strongswan config generation, we have an upgrade code in place for that, it should fix #4418 2015-03-06 11:29:25 -03:00
Renato Botelho
877740eed5 dns_split was a comma separated list and moved to use space as separator, provide upgrade code to make sure old configs are converted. Since there was a config upgrade version 11.7 only on master, I pushed it to 11.8 and used dns_split one as 11.7 to be able to backport it to RELENG_2_2. Ticket #4418 2015-03-06 11:28:40 -03:00
Renato Botelho
277810659a Remove multiple spaces from dns_split as a seatbelt, also fix the message since field is expected to be space separated and not comma. Ticket #4418 2015-03-06 11:26:18 -03:00