aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #827 from PiBa-NL/haproxy-devel21Renato Botelho2015-02-2417-16/+16
|\
| * haproxy-devel, move files to subfoldersPiBa-NL2015-02-2117-16/+16
* | Merge pull request #826 from phil-davis/patch-3Renato Botelho2015-02-231-2/+6
|\ \
| * | Validate widget_snort_display_linesPhil Davis2015-02-211-2/+6
* | | Merge pull request #820 from BBcan177/pfBlockerNG_021615_1Renato Botelho2015-02-235-146/+488
|\ \ \
| * | | pfBlockerNG - Mods to Alerts Tab JS VariableBBcan1772015-02-231-0/+2
| * | | pfBlockerNG - Alerts Tab cosmetic changesBBcan1772015-02-221-2/+1
| * | | pfBlockerNG - Remove Dev version Variable.BBcan1772015-02-221-1/+0
| * | | pfBlockerNG - Remove bak file again!BBcan1772015-02-221-2701/+0
| * | | pfBlockerNG - Mods for Nano Aliastables ro/rwBBcan1772015-02-222-3/+2712
| * | | pfBlockerNG - Alerts Tab Filter RegexBBcan1772015-02-221-10/+139
| * | | pfBlockerNG - Collect VIP Subnets for Alerts TabBBcan1772015-02-191-1/+4
| * | | pfBlockerNG - Mods to Schedule converterBBcan1772015-02-191-8/+8
| * | | Revert "pfBlockerNG - Mod to IPv4 CIDR Regex"BBcan1772015-02-191-1/+1
| * | | Revert "pfBlockerNG - Fix missing Start Hour code"BBcan1772015-02-191-4/+2
| * | | pfBlockerNG - Fix missing Start Hour codeBBcan1772015-02-191-2/+4
| * | | pfBlockerNG - Default "Keep Settings" to "on"BBcan1772015-02-181-0/+1
| * | | pfBlockerNG - Mod to IPv4 CIDR RegexBBcan1772015-02-171-1/+1
| * | | pfBlockerNG - Mods to Alerts Tab (IPv6)BBcan1772015-02-171-53/+60
| * | | pfBlockerNG - Remove bak file!BBcan1772015-02-171-866/+0
| * | | pfBlockerNG - Mods to Alerts tab for IPv6BBcan1772015-02-172-19/+889
| * | | pfBlockerNG - Mods to inc file.BBcan1772015-02-161-4/+4
| * | | pfBlockerNG - Improve Alerts Tab (Speed/Efficiency)BBcan1772015-02-161-64/+155
| * | | pfBlockerNG - Fix Aliastable issue on Nano/Ramdisk InstallationsBBcan1772015-02-162-37/+136
| | |/ | |/|
* | | Merge pull request #819 from dbaio/masterjim-p2015-02-232-2/+2
|\ \ \ | |_|/ |/| |
| * | apcupsd - fix e-mail notificationsDanilo G. Baio (dbaio)2015-02-162-2/+2
| |/
* | vhost: Added ['custom_php_service_status_command']dariomas2015-02-181-1/+1
* | Merge pull request #823 from dariomas/masterjim-p2015-02-181-1/+1
|\ \
| * | Corrected PHP bin-path for HTTPS vhost conf; (same as 7232161e99d60256c51a4ee...dariomas2015-02-181-1/+1
* | | zabbix - fix array config nameDanilo G. Baio (dbaio)2015-02-181-1/+1
|/ /
* | zabbix - rename PBI custom_nameDanilo G. Baio (dbaio)2015-02-181-4/+4
* | zabbix - create structure for LTS versionDanilo G. Baio (dbaio)2015-02-183-0/+689
* | Fix lightsquid graphsjim-p2015-02-172-1/+4
|/
* Merge pull request #818 from BBcan177/pfBlockerNG_021015_1Renato Botelho2015-02-133-151/+172
|\
| * pfBlockerNG - Alerts Tab ModificationsBBcan1772015-02-131-20/+26
| * pfBlockerNG - Redmine #4410 fix, Skip comment linesBBcan1772015-02-111-26/+36
| * pfBlockerNG - Move "Keep Settings" Checkbox to top of page.BBcan1772015-02-101-6/+6
| * pfBlockerNG - Improve Suppression and IPv6 RegexBBcan1772015-02-101-55/+60
| * pfBlockerNG - Cosmetic ChangesBBcan1772015-02-101-48/+48
* | Fix path reference (missing a /)jim-p2015-02-131-1/+1
* | Fixup config path for lcdproc on 2.2jim-p2015-02-122-2/+12
|/
* Merge pull request #812 from BBcan177/pfBlockerNG_020415_2Renato Botelho2015-02-103-2/+3
|\
| * pfBlockerNG - Remove previously used cc folder referenceBBcan1772015-02-052-2/+3
| * pfBlockerNG - Update MaxMind CC ArchiveBBcan1772015-02-041-0/+0
* | Various fixes for lightsquid on 2.2jim-p2015-02-102-7/+39
* | Be sure to copy the newly added phpmailer file.jim-p2015-02-101-1/+6
* | Update PHPMailer for mailreportsjim-p2015-02-105-3455/+4957
* | Remove conflicting variable $g in mailreports' mail_report_generate_graph()Bryce Chidester2015-02-101-3/+3
* | Fix rcvar declaration that I broke yesterday and bump necessary package versionsRenato Botelho2015-02-106-10/+10
* | Support mail report of mbuf usage graphPhil Davis2015-02-103-5/+50