aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #604 from crocomo/bindRenato Botelho2014-02-281-2/+2
|\
| * Merge remote-tracking branch 'upstream/master' into bindcrocomo2014-02-251-1/+1
| |\
| * | Fix indentation of custom optioncrocomo2014-02-231-2/+2
* | | Merge pull request #607 from parawizard/masterRenato Botelho2014-02-282-2/+2
|\ \ \
| * | | %P to %p for freebsd strftime compatiblityBryan Paradis2014-02-251-1/+1
| * | | %P to %p for freebsd strftime compatiblityBryan Paradis2014-02-251-1/+1
| | |/ | |/|
* | | Merge pull request #611 from PiBa-NL/hap_reloadcheckRenato Botelho2014-02-281-8/+6
|\ \ \
| * | | haproxy-devel, dont reload firewall rules every 2 minutes.PiBa-NL2014-02-281-8/+6
|/ / /
* | | Custom options should be before forward-zone as seen on the forum.Warren Baker2014-02-261-9/+8
* | | Respect the 0 valueWarren Baker2014-02-261-2/+2
* | | Merge pull request #608 from fschaeffler/Fix-for-email-address-as-execution-p...Renato Botelho2014-02-251-1/+1
|\ \ \
| * | | Update arpwatch.xmlFlorian Schäffler2014-02-251-1/+1
|/ / /
* | | 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
* | | | Remove Unbound as its in base on 2.2Warren Baker2014-02-251-25/+0
* | | | Missed this variable name change and bump version for all previous changesWarren Baker2014-02-253-5/+4
* | | | Merge pull request #605 from crocomo/mailreportErmal Luçi2014-02-257-32/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
* | Unbound version bump to make use of forward-zone insteadWarren Baker2014-02-232-2/+2
* | 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 #601 from bmeeks8/masterErmal Luçi2014-02-213-3/+3
|\| |
| * | Add new Suricata 1.4.6 IDS BETA package v0.1bmeeks82014-02-213-3/+3
* | | Merge pull request #579 from parawizard/masterErmal Luçi2014-02-2135-49/+2713
|\ \ \
| * | | 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
| * | | Updated pkg_config.8.* vnstat2 maintainer/versionBryan Paradis2014-01-222-4/+4
* | | | Merge pull request #600 from phil-davis/masterErmal Luçi2014-02-211-3/+2
|\ \ \ \