aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #593 from stilez/patch-1Marcello Coutinho2014-02-252-37/+39
|\
| * Add PERMIT BOTH option, and minor enhancementsstilez2014-02-171-13/+27
| * Add PERMIT BOTH option, and minor enhancementsstilez2014-02-171-24/+12
* | Missed this variable name change and bump version for all previous changesWarren Baker2014-02-251-3/+2
* | Merge remote-tracking branch 'upstream/master' into mailreportcrocomo2014-02-251-1/+1
|\ \
| * | varnish3 - fix xmlrpc sync optionMarcello Coutinho2014-02-241-1/+1
* | | Fix spelling, email header and table headercrocomo2014-02-257-32/+32
|/ /
* | Merge pull request #603 from crocomo/bindRenato Botelho2014-02-233-3/+4
|\ \
| * | Fix logging facilitiescrocomo2014-02-231-1/+2
| * | Typo s/bloc/blockcrocomo2014-02-231-1/+1
| * | Typo s/reveser/reversecrocomo2014-02-231-1/+1
* | | no longer neededWarren Baker2014-02-231-2/+0
|/ /
* | If this is enabled then get_nameservers() should be usedWarren Baker2014-02-231-1/+1
* | Add a safety belt in case we get no values returnedWarren Baker2014-02-231-6/+9
* | Add forwards as a configuration option instead of executing it on the command...Warren Baker2014-02-231-90/+58
* | Remove deprecated optionWarren Baker2014-02-231-10/+1
* | Merge pull request #602 from bmeeks8/masterRenato Botelho2014-02-222-2/+2
|\ \
| * | Fix typo in base rules filename.bmeeks82014-02-221-1/+1
| * | Fix copy-paste typo in system function name.bmeeks82014-02-211-1/+1
* | | Merge pull request #579 from parawizard/masterErmal Luçi2014-02-2133-45/+2709
|\ \ \
| * | | Moved php files into additional filesBryan Paradis2014-02-215-9/+0
| * | | Move www files into additional filesBryan Paradis2014-02-211-8/+8
| * | | Remove line as request by ermalBryan Paradis2014-02-211-1/+0
| * | | Menu name capitalizationBryan Paradis2014-01-271-1/+1
| * | | Typos dansguardian.incBryan Paradis2014-01-231-2/+2
| * | | fixed uninstall of vnstat.conBryan Paradis2014-01-231-1/+1
| * | | EOL conversionBryan Paradis2014-01-235-1/+5
| * | | updated vnstat.inc path in two xmlBryan Paradis2014-01-232-2/+2
| * | | vnstat2.xml paths + additional vnstat_php_frontendBryan Paradis2014-01-231-14/+124
| * | | updated vnstat2.inc paths, indents, uninstallBryan Paradis2014-01-221-19/+17
| * | | added vnstat_php_frontend moving away from tarBryan Paradis2014-01-2223-0/+2562
* | | | APC status text typosPhil Davis2014-02-201-3/+2
* | | | Move imspector-dev -> imspectorRenato Botelho2014-02-2011-1386/+406
* | | | Merge pull request #598 from dbaio/masterErmal Luçi2014-02-204-9/+144
|\ \ \ \
| * | | | apcupsd - added device fieldDanilo G. Baio (dbaio)2014-02-123-6/+9
| * | | | apcupsd - bump versionDanilo G. Baio (dbaio)2014-02-051-1/+1
| * | | | apcupsd - modifying default scripts to send mail reports on install package p...Danilo G. Baio (dbaio)2014-01-262-2/+38
| * | | | apcupsd - add script to send mail reportsDanilo G. Baio (dbaio)2014-01-261-0/+96
| |/ / /
* | / / openbgpd - fix blank listenip optionDanilo G. Baio (dbaio)2014-02-201-4/+12
| |/ / |/| |
* | | Merge pkg_config issues from pull request 597.Ermal2014-02-2031-0/+12201
|\ \ \
| * | | Use system calls instead of wrappers for getting interface names.bmeeks82014-02-1913-26/+26
| * | | Incorporate Ermal's comments into Suricata BETA pkg code.bmeeks82014-02-1911-583/+200
| * | | Removed need for suricata_log_view.php file, so deleting it.bmeeks82014-02-192-6/+0
| * | | BETA version of Suricata 1.4.6 IDS package v0.1 for pfSense.bmeeks82014-02-1933-0/+12590
* | | | Fix typo. Pointy-hat: myselfErmal2014-02-191-1/+1
|/ / /
* | | Merge pull request #584 from mbfgit/staticmap-reverseErmal Luçi2014-02-191-3/+24
|\ \ \
| * | | Update reverse zone for dhcp static mapmbfgit2014-02-031-3/+24
* | | | Merge pull request #576 from darksoul42/masterErmal Luçi2014-02-192-4/+19
|\ \ \ \
| * | | | Separate CAs for client certs and server cert chainStephane Lapie2014-01-202-4/+19
* | | | | Fix conflicts on pkg_config filesErmal2014-02-1910-421/+657
|\ \ \ \ \