Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 12:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of ssh://git.bro-ids.org/bro

Browse source
This commit is contained in:
Robin Sommer 2011-07-07 19:39:16 -07:00
commit d3e764155e
3 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bro-path-dev.in
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# After configured by CMake, this file prints the absolute path to policy # After configured by CMake, this file prints the absolute path to policy
# files that come with the source distributions of Bro and Broctl as well # files that come with the source distributions of Bro as well as policy
# as policy files that are generated by the BIF compiler at compile time # files that are generated by the BIF compiler at compile time.
# #
# The intended use of this script is to make it easier to run Bro from # The intended use of this script is to make it easier to run Bro from
# the build directory, avoiding the need to install it. This could be # the build directory, avoiding the need to install it. This could be
@ -14,8 +14,6 @@ broPolicies=${PROJECT_SOURCE_DIR}/policy:${PROJECT_SOURCE_DIR}/policy/frameworks
broGenPolicies=${CMAKE_BINARY_DIR}/src broGenPolicies=${CMAKE_BINARY_DIR}/src
broctlPolicies=${PROJECT_SOURCE_DIR}/aux/broctl/policy:${CMAKE_BINARY_DIR}/aux/broctl/policy/local
installedPolicies=${POLICYDIR}:${POLICYDIR}/frameworks:${POLICYDIR}/protocols:${POLICYDIR}/detectors:${POLICYDIR}/time-machine:${POLICYDIR}/site installedPolicies=${POLICYDIR}:${POLICYDIR}/frameworks:${POLICYDIR}/protocols:${POLICYDIR}/detectors:${POLICYDIR}/time-machine:${POLICYDIR}/site
echo .:$broPolicies:$broGenPolicies:$broctlPolicies echo .:$broPolicies:$broGenPolicies

2
policy/frameworks/cluster/base/main.bro
View file

@ -61,7 +61,7 @@ export {
event bro_init() event bro_init()
{ {
if ( node !in nodes ) if ( node != "" && node !in nodes )
{ {
local msg = "You didn't supply a valid node in the Cluster::nodes configuration."; local msg = "You didn't supply a valid node in the Cluster::nodes configuration.";
event reporter_error(current_time(), msg, ""); event reporter_error(current_time(), msg, "");

7
policy/frameworks/cluster/base/node/manager.bro
View file

@ -9,13 +9,6 @@
##! This is where the cluster manager sets it's specific settings for other ##! This is where the cluster manager sets it's specific settings for other
##! frameworks and in the core. ##! frameworks and in the core.
## Set the mail script to be the default script for the cluster deployment.
redef Notice::mail_script = "mail-alarm";
## Set the template value that the mail script will use to send email. The
## default mail-alarm script will replace the value.
redef Notice::mail_dest = "_broctl_default_";
## Set the port that the manager is supposed to listen on. ## Set the port that the manager is supposed to listen on.
redef Communication::listen_port_clear = Cluster::nodes[Cluster::node]$p; redef Communication::listen_port_clear = Cluster::nodes[Cluster::node]$p;