aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Bump suricata version due to PBI rebuildRenato Botelho2014-12-311-1/+1
|
* Merge pull request #762 from PiBa-NL/haproxy-devel_0_13Renato Botelho2014-12-316-73/+251
|\
| * haproxy-devel, fix saving errorfiles from errorfiles tab, fix write ↵PiBa-NL2014-12-296-73/+251
| | | | | | | | 'tcp-request content' before 'use_backend', fix hint text for a backend without servers, stats now give better description if disabled/unavailable, moved templates to their own tab
* | Merge pull request #763 from marcelloc/squid34_20141229Renato Botelho2014-12-312-27/+34
|\ \
| * | squid3.4 - update compile argsMarcello Coutinho2014-12-292-27/+34
| | | | | | | | | | | | | | | | | | fix captive portal check_ip for 2.2 fix ssl_bump with no authentication bump package version
* | | Merge pull request #743 from BBcan177/pfBlockerNG_Beta_0.99Renato Botelho2014-12-3018-0/+9397
|\ \ \
| * | | Fix typoBBcan1772014-12-201-1/+1
| | | |
| * | | Mods to sync_xml fileBBcan1772014-12-201-23/+75
| | | | | | | | | | | | | | | | Changes as per the previous commit for XMLRPC sync.
| * | | Mods to INC file.BBcan1772014-12-201-85/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move $pfb['cc'] Variable to global array - Edit log_error texts. - Maxmind Update Cron task changes. Cron tasks are now launched via a php script using the 'dc' Argument. - Re-work of the XMLRPC Sync code. - Previous code did not validate IP addresses or Port. - Previous code did not use the "Replication Target" Hosts enabled checkbox setting in Replication Target Lines. - Add htmlspecialchars() to the Password entry - Previous code did not use the correct user - defined "Protocol" entry. - Previous code did not use the $username entry. - Remove the 'post Sync' Host Target code execution as this can collide with a Cron Task or User Forced Update. - Allow user to skip the sync of the "General Tab" Settings. - Clean up all the log_error() texts.. To make the system.log easier to read.
| * | | Mods to pfblockerng.phpBBcan1772014-12-201-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Modify code to use fopen() and fgetcsv() instead of array_map() and str_getcsv(). This reduces the memory requirements dramatically. This version has now been tested on an ALIX board. - Change Maxmind Cron Task from Cron Shell script task to Cron php task using the 'dc' Arg. (Refer to the next commit for INC file Changes)
| * | | XHTML modsBBcan1772014-12-203-0/+9
| | | | | | | | | | | | | | | | Add CDATA sections to Javascripts
| * | | Mods to inc and log fileBBcan1772014-12-182-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Remove un-necessary code in de-install function of inc file. - Remove check for logfile extension as other file extensions can now be deleted in log browser.
| * | | Mods to inc file.BBcan1772014-12-181-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | - Remove redundant $row['format'] variable - When "Keep Settings" is enabled and a full uninstall is performed, the widget does not uninstall cleanly. These changes fix this issue.
| * | | Revert "Mods to inc file"BBcan1772014-12-182-2490/+18
| | | | | | | | | | | | | | | | This reverts commit 161032f05e1819550a32735d60c7b71994b1d9ef.
| * | | Mods to inc fileBBcan1772014-12-182-18/+2490
| | | | | | | | | | | | | | | | | | | | | | | | - remove redundant $row['format'] variable - When "Keep" Settings is enabled and a full uninstall is performed, the widget doesn't uninstall cleanly. These changes fix this issue.
| * | | Mods to inc file.BBcan1772014-12-181-2/+2
| | | | | | | | | | | | | | | | Add extra spaces to improve text clarity.
| * | | Mods to the Update TabBBcan1772014-12-181-4/+4
| | | | | | | | | | | | | | | | | | | | Allow user access to delete Files ( in the following folders - "Deny, Permit, Match and Native") from the Log Browser Tab.
| * | | Mods to pfblockerng.php, .inc, _sync, _v4 and _v6 files.BBcan1772014-12-155-54/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pfblockerng.inc - - Remove redundant ['action'] argument in if() statements. - If no interfaces are selected, defined empty variable and Array. - Separate "Skip & Hold" List download functionality into its own ['state'] process. This allows more fine grain control of each individual list in an Alias. - Remove argument for empty Interfaces in the Rules Re-order process. pfblockerng_sync.xml - - Fix broken link in sync file. pfblockerng_v4lists.xml and _v6 - - Separate "Skip & Hold" List download functionality into its own ['state'] process. This allows more fine grain control of each individual list in an Alias. - Minor Text improvements.
| * | | Mods to inc, Alerts and Log FilesBBcan1772014-12-103-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mod the 'Global Enable Log' if() statement in the .inc file - Use correct Folder Paths in Log Browser - Check if syslog array exists in Alerts Tab.
| * | | Mod to Alerts TabBBcan1772014-12-091-1/+1
| | | | | | | | | | | | | | | | - Re-Add /* to grep command. Removed by recent Commit.
| * | | Mods to SH ScriptBBcan1772014-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | - Remove part of the suppression as it was added to the PHP function in pfblockerng.inc (IPv4 Filter Array)
| * | | Mods to Update TabBBcan1772014-12-091-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | - XHTML edits <br> to <br /> - Minor Text change "process" to "progress"
| * | | Mods to Log BrowserBBcan1772014-12-091-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow user to Delete file(s) in the 'Original' Folder. This will allow the user to 'Force Update' the deleted List. - Include "Native Folder" File Viewing. - XHTML edit to <br> to <br />
| * | | Mod to Alerts TabBBcan1772014-12-091-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed is_array() to !empty() - XMTML edits <br> to <br /> , closed some end tags /> also added missing nowrap='nowrap' - Deny Alerts need to query "Deny" and "Native" folders for list files.
| * | | Mods to .inc fileBBcan1772014-12-091-52/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added IPv4 Filter Array to filter out Whitespaces, Loopback Addresses (27/8), 0.0.0.0 and any leading zeros in each IPv4 octet. - Edits to IPv4/6 Regex Definitions. - Changed isset() to !empty()
| * | | Revert "Mods to .inc file"BBcan1772014-12-092-2518/+52
| | | | | | | | | | | | | | | | This reverts commit f433c8da1a68f5684a2fb43950c8d3ea6d7c396a.
| * | | Mods to .inc fileBBcan1772014-12-092-52/+2518
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added IPv4 Filter Array to filter out Whitespaces, Loopback Addresses (27/8), 0.0.0.0 and and Leading zeros in each IPv4 octet. - Edits to IPv4/6 Regex definitions. - Changed isset() to !empty()
| * | | XHTML modsBBcan1772014-12-096-233/+233
| | | | | | | | | | | | | | | | | | | | | | | | All <br> to <br /> Widget Added alt="" to img tags Closed any open tags > to />
| * | | Mod to pfblockerng.phpBBcan1772014-12-081-3/+3
| | | | | | | | | | | | | | | | Change text "Manual" to "Force" Update.
| * | | Mods to Update TABBBcan1772014-12-081-221/+214
| | | |
| * | | Mods to the Alerts TabBBcan1772014-12-081-27/+32
| | | |
| * | | Remove "Reload" Option from the General TabBBcan1772014-12-085-15/+5
| | | | | | | | | | | | | | | | "Force Reload" will be added to the "Update" TAB.
| * | | Code EnhancementsBBcan1772014-12-074-71/+76
| | | |
| * | | Add pfBlockerNG User Manager PrivilegesBBcan1772014-12-071-0/+29
| | | |
| * | | MaxMind CC Archive and Shell Script Mods.BBcan1772014-12-0714-189925/+13
| | | | | | | | | | | | | | | | | | | | | | | | - Distribute the CC Files from MaxMind in Archive Format. - Mod the Fetch Command Arguments as the 2.2 'Fetch' issue has been resolved.
| * | | Merge branch 'master' of https://github.com/pfsense/pfsense-packages into ↵BBcan1772014-12-0711-61/+182
| |\ \ \ | | | | | | | | | | | | | | | pfBlockerNG_Beta_0.99
| * | | | pkg_config.10.xml Edits and Associated pkg filesBBcan1772014-11-3028-0/+199138
| | | | | | | | | | | | | | | | | | | | | | | | | Edits for pkg_config.10.xml All Associated files for pkg pfBlockerNG
| * | | | Revert "pfBlockerNG Beta v0.99"BBcan1772014-11-3028-198587/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit b3ce3bde07750e25fabca14faf18c0e5f0eb74dc.
| * | | | pfBlockerNG Beta v0.99BBcan1772014-11-3028-0/+198587
| | | | | | | | | | | | | | | | | | | | pkg_config.10.xml edits and associated files for Package pfBlockerNG
* | | | | Merge pull request #749 from dbaio/apcupsd_01Renato Botelho2014-12-302-4/+13
|\ \ \ \ \
| * | | | | apcupsd - bump versionDanilo G. Baio (dbaio)2014-12-291-1/+1
| | | | | |
| * | | | | apcupsd - fix codeDanilo G. Baio (dbaio)2014-12-241-3/+1
| | | | | |
| * | | | | apcupsd - fix rcfile for removing all types of lock files and put an ↵Danilo G. Baio (dbaio)2014-12-132-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | information for email notifications
* | | | | | Merge pull request #760 from SunStroke74/patch-1Renato Botelho2014-12-302-5/+23
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Added ability to change ClamAV mode from GUISunStroke742014-12-271-1/+1
| | | | | |
| * | | | | Added ability to change ClamAV mode from GUISunStroke742014-12-271-6/+8
| | | | | | | | | | | | | | | | | | Solves situation when "save" needs to be pressed twice.
| * | | | | Added ability to change ClamAV mode from GUISunStroke742014-12-271-1/+0
| | | | | | | | | | | | | | | | | | Solves situation when "save" needs to be pressed twice.
| * | | | | Added ability to change ClamAV mode from GUISunStroke742014-12-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Attention. Don`t know why, but to properly change mode settings needs to be saved twice. Looks like reading settings executing before "save" command. Maybe someone could investigate that. At this version added notice in gui.
| * | | | | Added ability to change ClamAV mode from GUISunStroke742014-12-271-0/+16
| | | | | |
* | | | | | Merge pull request #761 from bmeeks8/suricata-2.0.4-v2.1.2Renato Botelho2014-12-294-15/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |