aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* BIND - add support for multiple views per zone configurationStuart Wyatt2015-04-092-5/+10
| | | | | | | | | Often a zone configuration can be identical for LAN/local and WAN/pulic views, especially when using NAT reflection. This change allows those zones to only be entered once in the configuration and then applied to both the local and public views. The change converts the zone's 'view' field from a single selection to an array multiple selection. Since an old value of 'local' is the same as an array value with only one element for 'local', this change is backwards compatible with existing configurations. For that reason, I'm leaving the field name as 'view' rather than changing it to 'views' When the zones are being added to the view clause, it will now check to see if the view is in the zone's view list rather than checking to see if it is a simple match before including the zone in the view. By setting the old varible $zoneview to the matching view from the list, the existing code needs very little change.
* BIND - add support for zone update-policy statement on master zonesStuart Wyatt2015-04-092-1/+33
| | | | | | The update-policy statement allows the zone to specify, among other things, a key to be used for authorization of master zone updates Add a checkbox and text field to add an update-policy statement to the zone configuration. When the update-policy statement is used, it replaces the allow-update statement.
* BIND - clean up zone codeStuart Wyatt2015-04-091-6/+23
| | | | | | | | | Trim trailing ; from forwarders since ; is added when it is written to the config. Since it's a list of semi-colon separated values, users can accidently add a trailing ; Only ensure the view folder exists if the zone is not a 'forward' zone since forward zones are only in named.conf and don't have a .DB file Add allow-query statements to slave and redirect zones Add allowquery and allowupdate fields to on_type_zone_changed() Use isempty() on customoptions and forwarders to skip adding empty statements Use isempty() instead of == '' on some statements
* BIND - add support for named command line options -4 and -6Stuart Wyatt2015-04-092-5/+20
| | | | | | | | -4 and -6 restrict the resolver to use the IPv4 and IPv6 transports respectively. The option is needed for the cases such as when you have IPv6 enabled on the LAN, but the WAN does not support IPv6. Add a list of choices with IPv4+IPv6 (default), IPv4 (only) and IPv6 (only) If IPv4 is selected, -4 will be added to the command line If IPv6 is selected, -6 will be added to the command line
* BIND - add support for IPv6 reverse zonesStuart Wyatt2015-04-092-2/+23
| | | | | | | Add a supplemental checkbox to "Reverse Zone" which further qualifies the reverse zone as an IPv6 reverse zone. The resulting zone name will be *.ipv6.arpa rather than *.ip-addr.arpa This change was originally submitted by https://github.com/cuteredstorm/pfsense-packages/commit/2b4e8084a92c8e9936f1b2fdca8272d29217c20a for Bug #4553
* BIND - add global settings for named.confStuart Wyatt2015-04-092-0/+19
| | | | | | Add field similar to custom options, but for global settings. Rather than being added to the options{} clause, these settings are added directly to named.conf. This allows the addition of items such as key{} and server{} clauses.
* Merge pull request #849 from gogglespisano/apcupsdRenato Botelho2015-04-091-2/+5
|\
| * Apcupsd - Bug 4650 - Support TLS email notifications and update email ↵Stuart Wyatt2015-04-071-2/+5
| | | | | | | | | | | | notification flag tests Bump package number to 0.3.5
* | Merge pull request #848 from dbaio/apcupsdRenato Botelho2015-04-092-8/+130
|\ \
| * | apcupsd - replace system exec `hostname` for php function gethostname()Danilo G. Baio (dbaio)2015-04-091-1/+3
| | |
| * | apcupsd - use quotes for array key namesDanilo G. Baio (dbaio)2015-04-091-5/+5
| | |
| * | apcupsd - use function is_port()Danilo G. Baio (dbaio)2015-04-091-2/+2
| | |
| * | apcupsd - add link for pfSense forumDanilo G. Baio (dbaio)2015-04-071-0/+2
| | |
| * | apcupsd - bump versionDanilo G. Baio (dbaio)2015-04-071-1/+1
| | |
| * | apcupsd - change function apccontrol_scripts_install()Danilo G. Baio (dbaio)2015-04-071-2/+68
| | |
| * | apcupsd - add new fieldsDanilo G. Baio (dbaio)2015-04-071-5/+57
| | |
* | | Merge pull request #852 from dneuhaeuser/patch-3Renato Botelho2015-04-091-3/+3
|\ \ \
| * | | correction of path to squid binarayDennis Neuhaeuser2015-04-071-3/+3
| | | | | | | | | | | | | | | | corrected the base to the squid binary should be SQUID_BASE instead of SQUID_LOCALBASE
* | | | 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
| | | | | | | |