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

Merge remote-tracking branch 'origin/topic/dnthayer/ticket1700-part2'

Browse source 
* origin/topic/dnthayer/ticket1700-part2:
  Remove the node-specific local-*.bro scripts
This commit is contained in:
Jon Siwek 2018-08-20 14:58:58 -05:00
commit 000072978a
9 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.5-877 | 2018-08-20 14:58:58 -0500
* Remove the node-specific local-*.bro scripts (Daniel Thayer)
2.5-875 | 2018-08-20 12:45:32 -0500 2.5-875 | 2018-08-20 12:45:32 -0500
* Improve diff-remove-abspath canonifier: collapse '/' sequences * Improve diff-remove-abspath canonifier: collapse '/' sequences

2
NEWS
View file

@ -432,6 +432,8 @@ Removed Functionality
- BroControl: The "IPv6Comm" and "ZoneID" options are no longer - BroControl: The "IPv6Comm" and "ZoneID" options are no longer
available (though Broker should be able to handle IPv6 automatically). available (though Broker should be able to handle IPv6 automatically).
- The node-specific ``site/local-*.bro`` scripts have been removed.
Deprecated Functionality Deprecated Functionality
------------------------ ------------------------

2
VERSION
View file

@ -1 +1 @@
2.5-875 2.5-877

2
aux/broctl

@ -1 +1 @@
Subproject commit 70a8b2e15105f4c238765a882151718162e46208 Subproject commit 336e719c33d64efebe65f11322e2fbc6d11c946b

16
scripts/CMakeLists.txt
View file

@ -14,19 +14,3 @@ InstallPackageConfigFile(
${CMAKE_CURRENT_SOURCE_DIR}/site/local.bro ${CMAKE_CURRENT_SOURCE_DIR}/site/local.bro
${BRO_SCRIPT_INSTALL_PATH}/site ${BRO_SCRIPT_INSTALL_PATH}/site
local.bro) local.bro)
InstallPackageConfigFile(
${CMAKE_CURRENT_SOURCE_DIR}/site/local-manager.bro
${BRO_SCRIPT_INSTALL_PATH}/site
local-manager.bro)
InstallPackageConfigFile(
${CMAKE_CURRENT_SOURCE_DIR}/site/local-logger.bro
${BRO_SCRIPT_INSTALL_PATH}/site
local-logger.bro)
InstallPackageConfigFile(
${CMAKE_CURRENT_SOURCE_DIR}/site/local-proxy.bro
${BRO_SCRIPT_INSTALL_PATH}/site
local-proxy.bro)
InstallPackageConfigFile(
${CMAKE_CURRENT_SOURCE_DIR}/site/local-worker.bro
${BRO_SCRIPT_INSTALL_PATH}/site
local-worker.bro)

1
scripts/site/local-logger.bro
View file

@ -1 +0,0 @@
##! Local site policy loaded only by the logger if Bro is running as a cluster.

1
scripts/site/local-manager.bro
View file

@ -1 +0,0 @@
##! Local site policy loaded only by the manager if Bro is running as a cluster.

1
scripts/site/local-proxy.bro
View file

@ -1 +0,0 @@
##! Local site policy loaded only by the proxies if Bro is running as a cluster.

1
scripts/site/local-worker.bro
View file

@ -1 +0,0 @@
##! Local site policy loaded only by the workers if Bro is running as a cluster.