Commit Graph

29376 Commits

Author SHA1 Message Date
Renato Botelho
75bb92c4ec Set necessary env vars for pkg db and cache dir on nanobsd or when MFS partition is being used 2016-01-05 11:41:05 -02:00
Stephen Beaver
29e0928f3a Merge branch 'Status_-_System_Logs_-_Consolidation' of https://github.com/NOYB/pfsense
* 'Status_-_System_Logs_-_Consolidation' of https://github.com/NOYB/pfsense:
  Redmine #5731 Error when setting various system log settings from factory default config
  HTML Compliance - Status - System Logs - Firewall Summary View
  Fixup AJAX stuff so dynamic updating works.
  Rename functions per Phil suggestions.
  Remove commented out test code.
  Can' t do that here.  Remove space between php tags.
  Status - System Logs - Consolidate - Firewall Summary View
  Status - System Logs - Consolidate - Firewall Dynamic View
  Status - System Logs - Consolidate - Common Functions
2016-01-05 08:17:03 -05:00
Stephen Beaver
ea6b7324a6 Merge pull request #2296 from NOYB/HTML_Compliance_-_Form_Button_-_HRef 2016-01-05 07:57:47 -05:00
NOYB
cf7a4f099a HTML Compliance - Form Button - HRef
The name attribute is obsolete. Consider putting an id attribute on the nearest container instead.
The <a> name attribute is not supported in HTML5. Use the id attribute instead.
2016-01-05 07:57:44 -05:00
Renato Botelho
946e00188d Merge pull request #2343 from phil-davis/patch-3 2016-01-05 09:49:02 -02:00
Renato Botelho
0c637128bd Merge pull request #2253 from calvinbui/patch-1 2016-01-05 09:40:43 -02:00
Renato Botelho
d1f9426af7 Fix spaces and indent 2016-01-05 09:08:10 -02:00
Chris Buechler
d47fe94992 fix redirurl for nginx 2016-01-05 09:08:10 -02:00
Chris Buechler
4bebb56a23 Add more lighttpd pieces to obsoletedfiles list 2016-01-05 09:08:10 -02:00
Chris Buechler
32818dd976 Include CA chain in certificate for nginx 2016-01-05 09:08:10 -02:00
Chris Buechler
1d0c3a1096 Add nginx redirection for captive portal 2016-01-05 09:08:10 -02:00
Chris Buechler
481909217e lighty clean up 2016-01-05 09:08:10 -02:00
Chris Buechler
e90d9933a7 some CP clean up in nginx start 2016-01-05 09:08:10 -02:00
Chris Buechler
257fdefe7c Bring back $ca in config function 2016-01-05 09:08:10 -02:00
Renato Botelho
cd41643dcd Rename pid files from lighty to nginx 2016-01-05 09:08:10 -02:00
Renato Botelho
40880eec35 Rename php-fpm pool from lighty to nginx 2016-01-05 09:08:10 -02:00
Renato Botelho
d15f76be8c Retire system_generate_lighty_config() 2016-01-05 09:08:10 -02:00
Chris Buechler
57cc06af8f un-break SVG graphs 2016-01-05 09:08:10 -02:00
Chris Buechler
4877ae1e5f start converting CP to nginx 2016-01-05 09:08:10 -02:00
Chris Buechler
c4a278f2ac start switching CP to nginx 2016-01-05 09:08:10 -02:00
Chris Buechler
f77f43ff91 Skip error_log when disabled. 2016-01-05 09:08:10 -02:00
Chris Buechler
c4104141e4 add config upgrade code for lighty->nginx logging 2016-01-05 09:08:10 -02:00
Chris Buechler
05f9712de1 clean up lighttpd 2016-01-05 09:08:10 -02:00
Chris Buechler
7bbe501330 clean up lighttpd 2016-01-05 09:08:10 -02:00
Chris Buechler
8811dfc38b Keeping the disable logging option. Revert "clean up lighttpd bits"
This reverts commit 9de0332dec955ec513b74be9361de72d12aa7245.
2016-01-05 09:08:10 -02:00
Chris Buechler
84a7c17d88 clean up lighttpd bits 2016-01-05 09:08:10 -02:00
Chris Buechler
33d69e816f clean up restart_webgui 2016-01-05 09:08:10 -02:00
Chris Buechler
c74719cde7 add all of /usr/local/lib/lighttpd to obsoletedfiles 2016-01-05 09:08:10 -02:00
Chris Buechler
be6da8a468 fix up nginx logging 2016-01-05 09:08:10 -02:00
Chris Buechler
1e8599e549 first run through, replacing lighttpd with nginx. 2016-01-05 09:08:10 -02:00
Chris Buechler
bba669d9cb Merge pull request #1959 from davidjwood/rfc4638 2016-01-05 01:21:45 -06:00
Stephen Beaver
b189563909 Fix interface list 2016-01-04 21:42:25 -05:00
Stephen Beaver
f7d2d5aab0 Improve error message when the user forget to "Apply" 2016-01-04 21:41:54 -05:00
jim-p
af8397ca73 Add a default case for IPv6 in rc.banner, otherwise whatever trips first gets used for the later interfaces as well. 2016-01-04 15:34:15 -05:00
NOYB
8cc5e083fc Redmine #5731 Error when setting various system log settings from factory default config
From PR #2350 By Phil Davis
2016-01-04 10:44:10 -08:00
NOYB
d78a79ebb9 HTML Compliance - Status - System Logs - Firewall Summary View
The align attribute on the div element is obsolete. Use CSS instead.
Replace with bootstrap class="text-center".
2016-01-04 10:44:10 -08:00
NOYB
f970359638 Fixup AJAX stuff so dynamic updating works.
Move getGETPOSTsettingvalue function to be more centrally located in guiconfig.inc.
2016-01-04 10:44:09 -08:00
NOYB
0039dab02d Rename functions per Phil suggestions.
s/miscellaneous_common_code/status_logs_common_code/
s/build_if_list/status_logs_build_if_list/

As for getGETPOSTsettingvalue I'm open to it going anywhere that makes sense.  Would be nice not to need too many additional inc's to get it though.  Anything in guiconfig.inc or filter_logs.inc hierarchy shouldn't require anything additional.
2016-01-04 10:44:08 -08:00
NOYB
2f77769571 Remove commented out test code. 2016-01-04 10:44:07 -08:00
NOYB
c57067d41a Can' t do that here. Remove space between php tags. 2016-01-04 10:44:06 -08:00
NOYB
c9513bad1d Status - System Logs - Consolidate - Firewall Summary View
Update summary view log selection method to same method as firewall and system logs.
2016-01-04 10:44:05 -08:00
NOYB
9e505d4b52 Status - System Logs - Consolidate - Firewall Dynamic View
Add advanced filtering to firewall dynamic view.
Add manage log to dynamic view.
Update dynamic view view log selection method to same method as firewall and system logs.
2016-01-04 10:44:04 -08:00
NOYB
55f8344d7e Status - System Logs - Consolidate - Common Functions
Factor common code section into to functions and place in include file.

 getGETPOSTsettingvalue
 miscellaneous_common_code
 tab_array_logs_common

 log_filter_form_system_submit
 filter_form_system

 log_filter_form_firewall_submit
 filter_form_firewall
 build_if_list

 manage_log_code
 manage_log_section
2016-01-04 10:44:03 -08:00
Stephen Beaver
4988278920 Further fix on saving shaper->queue->mask 2016-01-04 13:18:26 -05:00
Stephen Beaver
3957ee3453 Merge pull request #2352 from phil-davis/status_graph 2016-01-04 11:45:06 -05:00
Stephen Beaver
bbb5d7a5b6 Fixed #5733 2016-01-04 11:37:09 -05:00
Phil Davis
1c18517284 Add back display description option for status_graph
The code that provides the data for this is already in
bandwidth_by_ip.php in both 2.2.* and master 2.3.
The description option is in the Display dropdown list in 2.2.*, but it
got missed in the bootstrap conversion and integration process.
With just this 1-line addition the Display Description option can be
selected and works.
2016-01-04 22:10:21 +05:45
Stephen Beaver
187f96b9ad Correct "noWrap" in text areas. (Function is not actually used by anyone, but it might as well work just in case. 2016-01-04 09:08:22 -05:00
Stephen Beaver
951a7169ab Merge pull request #2351 from NOYB/HTML_Compliance_-_Firewall_/_NAT/_1_1_/_Edit 2016-01-04 08:01:59 -05:00
Stephen Beaver
24fa1d892c Merge pull request #2350 from phil-davis/status_logs 2016-01-04 08:01:20 -05:00