aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #660 from Onkelborg/masterRenato Botelho2014-08-271-1/+1
|\
| * Bugfix: Slave zones honour allow transferOskar Johansson2014-05-161-1/+1
| | | | | | Fix bug where slave zones didn't honour the allow-transfer setting and wrote "none" in the config at all times
* | Merge pull request #681 from msilvoso/masterRenato Botelho2014-08-268-18/+64
|\ \
| * | Requested changesManuel Silvoso2014-07-254-24/+25
| | |
| * | Tabs to spaces and merged changes from crypt.php into crypt_acb.phpManuel Silvoso2014-07-252-12/+15
| | |
| * | removed: closing php tagsManuel Silvoso2014-07-255-5/+0
| | |
| * | added proxy configuration to autoconfigbackupManuel Silvoso2014-07-253-3/+50
| | |
* | | Merge pull request #692 from bmeeks8/snort-2.9.6.2-v3.1.2Renato Botelho2014-08-2613-148/+367
|\ \ \
| * | | Fix-up reverse DNS lookup and table sorting for pfSense 2.2.bmeeks82014-08-144-43/+128
| | | |
| * | | More fixes for Link-Local addresses in HOME_NET and Pass Lists.bmeeks82014-08-111-12/+24
| | | |
| * | | Fix error preventing rules rebuild when duplicating an interface.bmeeks82014-08-061-3/+3
| | | |
| * | | Fix typo in hyperlink to GLOBAL SETTINGS tab.bmeeks82014-07-291-1/+1
| | | |
| * | | Include Link-Local address in HOME_NET and default Pass Listbmeeks82014-07-291-32/+51
| | | |
| * | | Fix-up URLs for Snort rule subscription sign-ups.bmeeks82014-07-291-2/+2
| | | |
| * | | Bump Snort GUI package version to v3.1.2 -- bug fixes.bmeeks82014-07-284-5/+5
| | | |
| * | | Fix Port Scan select alias behavior to not lose previous values.bmeeks82014-07-281-2/+35
| | | |
| * | | Revert to old behavior for rule forced enable/disable icon. Add save msg.bmeeks82014-07-271-7/+37
| | | |
| * | | Fix so we don't lose typed field values when selecting an Alias.bmeeks82014-07-271-47/+87
| | | |
| * | | Add missing equals sign in front of string value.bmeeks82014-07-271-1/+1
| |/ /
* | | Merge pull request #693 from jwbrown77/dns-rebaseRenato Botelho2014-08-214-34/+113
|\ \ \
| * | | Change require to not specify full path since its already in the include_pathJeremy Brown2014-08-211-1/+1
| | | |
| * | | Replace newline in heredoc with actual newline per mainatiner requestJeremy Brown2014-07-311-2/+3
| | | |
| * | | Make tinydns failover IPv6 comaptibleAnton2014-07-312-19/+41
| | | |
| * | | Changed startup script for correct startup and correct handling of failover ↵Anton2014-07-312-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | principle Added functions.inc to tinydns.sh to correct the bug that caused an empty pkgpinghost file during startup of tinydns placed kill pinghost.sh in svscan.sh, because there it also is started Changed the tinydns_get_backup_record function to scan hostname instead of ipaddress (hoostname is unique, ipaddress is not. Also changed statuschecking against monitorip instead of failoverip. And added interface used in setup_ping_items so it using the correct interface in multiwan setups.
| * | | Changed status page of tinydns to view correct monitor statusAnton2014-07-311-9/+33
| | | | | | | | | | | | | | | | | | | | Changed layout of status page to show all relevant data of failover dns info
| * | | Change Logs to show correct dataAnton2014-07-311-3/+4
| |/ / | | | | | | | | | | | | Changed line 35 to show correct ipaddress Changed line 56 to 58 to cerrectly clear log file
* | | Merge pull request #689 from dbaio/masterRenato Botelho2014-08-193-5/+5
|\ \ \
| * | | zabbix2 - update packages to 2.2.4Danilo G. Baio (dbaio)2014-07-233-5/+5
| | | |
* | | | Fix redis path for 2.2 (ntopng)jim-p2014-08-151-2/+9
| | | |
* | | | Fix path to geoip update scriptjim-p2014-08-131-1/+1
| | | |
* | | | More fixes for ntopng. Once the latest binaries are all in place it can be ↵jim-p2014-08-131-12/+69
| | | | | | | | | | | | | | | | activated for testing.
* | | | Misc refinements for ntopngjim-p2014-08-131-0/+3
| | | |
* | | | Fix filenamejim-p2014-08-121-0/+0
| | | |
* | | | Some blind changes to correct for ntopng differences.jim-p2014-08-121-62/+57
| | | |
* | | | Add skeleton for ntopng, not active to install yet.jim-p2014-08-121-0/+178
| |/ / |/| |
* | | Bump Snort GUI package version to 3.1.1 for bug fix.bmeeks82014-07-254-5/+5
| | |
* | | Improve code for remove_blocked_hosts cron task mgmt.bmeeks82014-07-251-0/+7
| | |
* | | Fix-up cron task path to new home of rules update PHP file.bmeeks82014-07-251-1/+1
| | |
* | | Merge pull request #688 from bmeeks8/snort-2.9.6.2-v3.1Renato Botelho2014-07-2422-2664/+2261
|\ \ \
| * | | Forgot to change default Snort binary version here.bmeeks82014-07-231-1/+1
| | | |
| * | | Update Snort package to latest 2.9.6.2 binary and fix some GUI bugs.bmeeks82014-07-2322-2664/+2261
| |/ /
* | | More formatting/bracesMatt Smith2014-07-241-2/+3
| | |
* | | put brackets around nested ifs to clarify where the else belongs.Matt Smith2014-07-241-1/+2
| | |
* | | Fix #3772 - 'Broken openbgpd config generation logic in 2.2'.Matt Smith2014-07-241-4/+5
|/ / | | | | | | | | | | Change logic guiding generation of local-address statements in neighbor configs so that only one local-address is generated when a 'Local address X' parameter is defined for a neighbor.
* | Bump avahi version to 1.0.5 due to recent changesRenato Botelho2014-07-171-1/+1
| |
* | Merge pull request #682 from razzfazz/fix_avahi_masterRenato Botelho2014-07-172-5/+5
|\ \
| * | fix note to indicate that WAN interface is ALWAYS excludedDaniel Becker2014-07-021-1/+1
| | |
| * | fix avahi config generationDaniel Becker2014-07-022-4/+4
| | |
* | | Merge pull request #684 from trendchiller/masterRenato Botelho2014-07-174-4/+8
|\ \ \ | |/ / |/| |
| * | clarify the hintMartin Fuchs2014-06-184-4/+4
| | |