aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #829 from ApolloDS/masterRenato Botelho2015-04-091-2/+2
|\
| * Use stable release of check_mk_agent (v1.2.6)Peter Baumann2015-03-041-2/+2
| | | | | | | | | | HEAD Version is considered BETA, Stable Release is v1.2.6. See here: http://mathias-kettner.de/check_mk_download.html
* | Merge pull request #711 from PiBa-NL/spamd_pfsense2.2Renato Botelho2015-04-093-40/+50
|\ \
| * | spamd, -fix 'add spamtrap'PiBa-NL2015-02-241-29/+25
| | | | | | | | | | | | -use exec() instead of exploding output of directly invoking a shell command
| * | spamd, replace the shell calls by unlink_if_exists() and symlink()PiBa-NL2015-02-241-2/+2
| | |
| * | spamd, fix spamtrap and blacklist buttons, fix startup on pfSense 2.2PiBa-NL2015-02-243-23/+37
| | |
* | | Merge pull request #803 from tuyan/masterRenato Botelho2015-04-091-1/+4
|\ \ \
| * | | Fixed phpservice status not being able to extract status from ps.Tuyan Ozipek2015-02-021-1/+4
| | | |
* | | | Merge pull request #840 from ReinaldoFeitosa/masterRenato Botelho2015-04-091-0/+4
|\ \ \ \
| * | | | Update sqstat.class.phpReinaldoFeitosa2015-03-291-1/+0
| | | | | | | | | | | | | | | Removed echo (Debug)
| * | | | Update sqstat.class.phpReinaldoFeitosa2015-03-231-0/+5
| | | | | | | | | | | | | | | Fix erro in Squid 3.2 or later
* | | | | Merge pull request #853 from gogglespisano/bindRenato Botelho2015-04-091-17/+6
|\ \ \ \ \
| * | | | | BIND package code clean up - variable initialization and dead codeStuart Wyatt2015-04-071-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize variables before .= concatenation Remove dead code (unused copy/paste of zone CONFIG settings not used in zone DB) Remove unused [$i] on $custom_root_zone and initialize
* | | | | | Merge pull request #844 from dneuhaeuser/patch-1Renato Botelho2015-04-071-7/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | corrected comparison of reservedhigh port numberDennis Neuhaeuser2015-04-041-2/+2
| | | | | | | | | | | | | | | | | | now the comparison should be correct
| * | | | | correction of portrange checkingdneuhaeuser2015-04-031-5/+5
| | | | | | | | | | | | | | | | | | configured port needs checking against sysctl parameter sysctl "net.inet.ip.portrange.reservedhigh" instead of "net.inet.ip.portrange.first".
* | | | | | Merge pull request #850 from gogglespisano/bindRenato Botelho2015-04-077-1131/+1229
|\ \ \ \ \ \
| * | | | | | BIND package code clean upStuart Wyatt2015-04-077-1131/+1229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code cleanup to reflect coding style guidelines and consistency Tabs only, always uses braces, spacing C/C++ style comments Use array_key_exists instead of key_exists $config[] keys are always enclosed in quotes and use single quotes for literals
* | | | | | | Merge pull request #828 from nliaudat/patch-1Renato Botelho2015-04-072-5/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update squidguard.xmlNicolas Liaudat2015-03-311-1/+1
| | | | | | |
| * | | | | | Update squidguard_configurator.incNicolas Liaudat2015-03-041-2/+2
| | | | | | |
| * | | | | | Update squidguard_configurator.incNicolas Liaudat2015-02-251-4/+13
| | | | | | | | | | | | | | | | | | | | | Fix commit eb7182a & it's revert to finaly works for everybody :)
* | | | | | | Merge pull request #846 from PiBa-NL/haproxy-devel21Renato Botelho2015-04-072-20/+20
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | haproxy 1.5, move advanced settings below forwardfor to avoid a (possible) ↵PiBa-NL2015-04-041-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | warning
| * | | | | | haproxy 1.5, bump version on 2.2 to 1.5.11, move advanced settings below ↵PiBa-NL2015-04-031-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | forwardfor to avoid a (possible) warning
* | | | | | | Add some fixes/additions for better handling of GeoIP data in ntopng. Fixes ↵jim-p2015-04-031-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #4567 Also add attribution text for GeoIP data and a link back to maxmind for CC BY-SA 3.0.
* | | | | | | Bump OpenVPN client export so it uses the latest installers.jim-p2015-04-022-2/+2
| | | | | | |
* | | | | | | A few simplifications in vnstat2jim-p2015-03-271-7/+5
| | | | | | |
* | | | | | | Merge pull request #841 from dbaio/apcupsd_statusRenato Botelho2015-03-273-8/+104
|\ \ \ \ \ \ \
| * | | | | | | apcupsd - change path of an include fileDanilo G. Baio (dbaio)2015-03-271-1/+1
| | | | | | | |
| * | | | | | | apcupsd - change messageDanilo G. Baio (dbaio)2015-03-251-2/+2
| | | | | | | |
| * | | | | | | apcupsd - fix tabsDanilo G. Baio (dbaio)2015-03-251-26/+26
| | | | | | | |
| * | | | | | | apcupsd - bump versionDanilo G. Baio (dbaio)2015-03-241-1/+1
| | | | | | | |
| * | | | | | | apcupsd - improve status pageDanilo G. Baio (dbaio)2015-03-241-7/+63
| | | | | | | |
| * | | | | | | apcupsd - add functionsDanilo G. Baio (dbaio)2015-03-241-0/+40
| | |_|/ / / / | |/| | | | |
* / | | | | | Prevent radiusd from being started multiple times by adding critical section ↵k-paulius2015-03-221-1/+36
|/ / / / / / | | | | | | | | | | | | | | | | | | to the startup script. Fixes #4337.
* | | | | | Merge pull request #837 from BBcan177/pfBlockerNG_03_17_15-1Renato Botelho2015-03-2015-111/+125
|\ \ \ \ \ \
| * | | | | | pfBlockerNG - Mods - Create Suppression FileBBcan1772015-03-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Previous version would not clear old suppression file when Alias is empty.
| * | | | | | pfBlockerNG - (c)2015 ModsBBcan1772015-03-1715-22/+22
| | | | | | |
| * | | | | | pfBlockerNG - Mods to pfblockerng_diag_dnsBBcan1772015-03-171-88/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Align pfblockerng_diag_dns.php to pfSense diag_dns.php changes - Code style mods.
* | | | | | | Merge pull request #836 from bmeeks8/snort-2.9.7.2-v3.2.4Renato Botelho2015-03-206-10/+10
|\ \ \ \ \ \ \
| * | | | | | | Bump Snort package version to 2.9.7.2-v3.2.4bmeeks82015-03-173-5/+5
| | | | | | | |
| * | | | | | | Need to trim trailing backslash off OpenAppID path.bmeeks82015-03-171-1/+1
| | | | | | | |
| * | | | | | | Bump default for Snort binary version to 2.9.7.2bmeeks82015-03-171-1/+1
| | | | | | | |
| * | | | | | | Fix missing $ in front of array variable name.bmeeks82015-03-171-1/+1
| | | | | | | |
| * | | | | | | Fix typo in URL for GPLv2 Community Rules details link.bmeeks82015-03-171-2/+2
| |/ / / / / /
* | | | | | | Fix quagga carp plugin name and version bump.jim-p2015-03-182-2/+2
| | | | | | |
* | | | | | | Give ldconfig a nudge for sudo (temp workaround for library issues)jim-p2015-03-182-2/+6
|/ / / / / /
* | | | | | Merge pull request #834 from PiBa-NL/haproxy-devel21RELENG_2_2_1jim-p2015-03-162-6/+6
|\| | | | |
| * | | | | haproxy-1_5, haproxy-devel, pkg v0.22 fix SNI handling inspect-delay 5s ↵PiBa-NL2015-03-162-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | instead if 5ms, show 'not' in acls when set