aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'apnar2012-08-280-0/+0
|\
| * Merge pull request #314 from apnar/masterJim P2012-08-286-0/+693
| |\ | | | | | | Added tinc package
* | | added tinc package to 32bit pkg_configapnar2012-08-281-0/+23
| |/ |/|
* | adding tinc packageapnar2012-08-286-0/+693
|/
* Fix constant define syntaxjim-p2012-08-241-7/+7
|
* Some Avahi adjustments to help with using it on VPNs.jim-p2012-08-244-5/+5
|
* Merge pull request #313 from phildd/masterJim P2012-08-242-9/+15
|\ | | | | arpwatch fixes from forum and for 2.1
| * Fix arpwatch so selected interface happens first timephildd2012-08-241-1/+5
| | | | | | | | | | See: http://forum.pfsense.org/index.php/topic,51007.0.html After selecting an interface for arpwatch, the first time you "save" the selection is written to the config file, but arpwatch.sh gets written with the previous value. arpwatch starts on some other interface. You have to press save twice. This fixes the problem - code as per the forum suggestion and it works nicely for me.
| * Look for arp.dat in /var/logphildd2012-08-241-2/+2
| | | | | | As per change in arpwatch.xml, arp.dat is in /var/log
| * Make arpwatch work on 21 and nanobsdphildd2012-08-241-6/+8
|/ | | | | On 2.1 arpwatch was putting its log file (arp.dat) into a "pbi" folder where it was installed. arpwatch_reports.php didn't know anything about that, so didn't find it. On nanobsd the usr pbi location is RO anyway. So, arp.dat moved to /var/log Some code added to touch the file from rc.d/arpwatch.sh - arpwatch complains if the file does not exist when it starts.
* Fix wordingjim-p2012-08-232-4/+4
|
* Change up some bgpd initialization, fixes #2572jim-p2012-08-221-55/+61
|
* Unbreak OpenOSPFD but also flag it as depreciated in favor of Quagga OSPF. ↵jim-p2012-08-223-4/+6
| | | | Fixes #2575
* Merge pull request #312 from phil-davis/masterJim P2012-08-223-27/+28
|\ | | | | Ipguard minor cleanup
| * Fix Ipguard initial setup PHP warningsPhil Davis2012-08-221-18/+19
| | | | | | | | Add some checks that ipguard.sh exists - before anything is setup in the GUI it does not exist. Improve the test for doing the XMLRPC sync - it was trying to do this even if there was nothing setup at all.
| * Ipguard GUI minor text changesPhil Davis2012-08-221-8/+8
| |
| * Update Ipguard Sync page titlePhil Davis2012-08-221-1/+1
|/ | | Make it say Ipguard - Sync when navigating to the Sync tab.
* squid3 - re-enable dns helper compile optionMarcello Coutinho2012-08-212-2/+2
|
* Fix syntax errorjim-p2012-08-181-1/+1
|
* Merge pull request #311 from julienberton/patch-1Jim P2012-08-161-3/+3
|\ | | | | Update config/quagga_ospfd/quagga_ospfd.inc
| * Update config/quagga_ospfd/quagga_ospfd.incjulienberton2012-08-161-3/+3
|/ | | | | | | OSPF passwords are in Quagga configuration surrounded by quotes, which is result in MD5 authentication failures where other side like Cisco routers defined the password without quotes.
* A couple version bumps to match new binaries.jim-p2012-08-122-14/+12
|
* Enclose this in quotes, since it may contain spaces. Otherwise, openvpn will ↵jim-p2012-08-094-4/+4
| | | | choke on it.
* Fix inline client exportjim-p2012-08-094-3/+5
|
* Merge pull request #310 from dhatz/masterJim P2012-08-091-1/+1
|\ | | | | fix typo
| * Update config/openvpn-client-export/openvpn-client-export.incdhatz2012-08-091-1/+1
|/
* Teach the OpenVPN Client Export package how to make config archives for ↵jim-p2012-08-035-3/+98
| | | | Yealink T28, Yealink T38g, and SNOM SIP handsets.
* Merge pull request #309 from phil-davis/masterJim P2012-08-021-0/+1
|\ | | | | Add a matching conf_mount_ro call for squid
| * Add a matching conf_mount_ro call for squidPhil Davis2012-08-021-0/+1
|/ | | | After write_rcfile() we need to conf_mount_ro() so that the mount reference count is decremented, otherwise the filesystem will get left in read-write mode on nanobsd. Note: in squid_resync there is already a correct pair of conf_mount_rw() and conf_mount_ro(), so no need to touch that for squid(2).
* Merge pull request #308 from phil-davis/masterErmal Luçi2012-08-011-1/+2
|\ | | | | Make matching conf_mount_ro calls during squid3 installation
| * Make matching conf_mount_ro calls for squidPhil Davis2012-08-021-1/+2
| | | | | | | | After initial installation of squid3 (squid-reverse folder) the shared-memory section mount count is left at 3. This means that on nanobsd the CF card is left mounted read-write. This condition will persist until the next reboot, because there is nothing to decrement the count. I have found 2 places here that do not match up conf_mount_rw and conf_mount_ro calls. There might be 1 more somewhere (or one of these routines is called twice during installation). I can check that when this change is committed and I can do another install from scratch.
* | mailscanner - include incoming/Locks folder permission checkMarcello Coutinho2012-07-311-7/+6
| |
* | Merge pull request #307 from Podilarius/patch-7Ermal Luçi2012-07-311-2/+1
|\ \ | | | | | | Update config/squid3/proxy_monitor.sh
| * | Update config/squid3/proxy_monitor.shRichard Adams2012-07-311-2/+1
| | | | | | | | | Change to match 2.1 config also.
* | | Merge pull request #306 from Podilarius/patch-6Ermal Luçi2012-07-311-2/+1
|\ \ \ | |/ / |/| | Change the way we keep only one going and no more.
| * | Change the way we keep only one going and no more.Richard Adams2012-07-311-2/+1
|/ / | | | | | | Test and reboot tested. Only 1 starts up. Theoretically, it should not even start 1, but if I set it to greater than 1, 2 opens up and remains open. I guess it is preloading the variables? Just have to watch the behavior and see if that ever changes. 
* | Merge pull request #303 from Podilarius/patch-3Marcello Coutinho2012-07-301-1/+1
|\ \ | | | | | | Update config/squid3/proxy_monitor.sh
| * | Update config/squid3/proxy_monitor.shRichard Adams2012-07-301-1/+1
| | |
* | | Merge pull request #302 from Podilarius/patch-2Marcello Coutinho2012-07-301-1/+1
|\ \ \ | |/ / |/| | Update config/squid-reverse/proxy_monitor.sh
| * | Update config/squid-reverse/proxy_monitor.shRichard Adams2012-07-301-1/+1
|/ /
* | Merge pull request #301 from Podilarius/masterMarcello Coutinho2012-07-301-0/+5
|\ \ | | | | | | To keep proxy_monitor.sh from starting more than one.
| * | Update config/squid-reverse/proxy_monitor.shRichard Adams2012-07-301-0/+5
| | |
* | | Merge pull request #300 from Podilarius/patch-1Marcello Coutinho2012-07-301-0/+6
|\ \ \ | |/ / |/| | Update config/squid3/proxy_monitor.sh
| * | Update config/squid3/proxy_monitor.shRichard Adams2012-07-301-0/+6
|/ /
* | Merge pull request #297 from digdug3/patch-2Ermal Luçi2012-07-270-0/+0
|\ \ | | | | | | Update config/snort/snort_blocked.php
| * | Update config/snort/snort_blocked.phpdigdug32012-07-261-3/+2
| | | | | | | | | Snort 2.9.2.3 pkg v. 2.5.1 Blocked Tab fix, fixes Snort blocked descriptions with ",". (Not just N/A)
* | | Merge pull request #295 from digdug3/masterErmal Luçi2012-07-273-89/+107
|\ \ \ | | | | | | | | Snort Widget v0.3.2 fix (update 26-07-2012)
| * | | Update config/widget-snort/snort_alerts.widget.phpdigdug32012-07-261-2/+0
| | | | | | | | | | | | Removed a bogus line
| * | | Update config/widget-snort/snort_alerts.widget.phpdigdug32012-07-251-53/+75
| | | | | | | | | | | | Sorts all interfaces by date, displays ip and port, fixes Snort alert descriptions with ",". Uses firewall widget setting as number of entries.
| * | | Update config/snort/snort_blocked.phpdigdug32012-07-251-13/+12
| | | | | | | | | | | | Fix Snort alerts descriptions with "," like: "ET TROJAN MS Terminal Server User A Login, possible Morto inbound"