diff --git a/CHANGES b/CHANGES index 0eb7336ac2..6b4c44d20e 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Improve diff-remove-abspath canonifier: collapse '/' sequences diff --git a/NEWS b/NEWS index afe19d91b9..6d1c628039 100644 --- a/NEWS +++ b/NEWS @@ -432,6 +432,8 @@ Removed Functionality - BroControl: The "IPv6Comm" and "ZoneID" options are no longer available (though Broker should be able to handle IPv6 automatically). +- The node-specific ``site/local-*.bro`` scripts have been removed. + Deprecated Functionality ------------------------ diff --git a/VERSION b/VERSION index f77e8fcc00..fea70a1577 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-875 +2.5-877 diff --git a/aux/broctl b/aux/broctl index 70a8b2e151..336e719c33 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 70a8b2e15105f4c238765a882151718162e46208 +Subproject commit 336e719c33d64efebe65f11322e2fbc6d11c946b diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index fb20ba6fdb..96c682871a 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -14,19 +14,3 @@ InstallPackageConfigFile( ${CMAKE_CURRENT_SOURCE_DIR}/site/local.bro ${BRO_SCRIPT_INSTALL_PATH}/site 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) diff --git a/scripts/site/local-logger.bro b/scripts/site/local-logger.bro deleted file mode 100644 index 0642e86ce3..0000000000 --- a/scripts/site/local-logger.bro +++ /dev/null @@ -1 +0,0 @@ -##! Local site policy loaded only by the logger if Bro is running as a cluster. diff --git a/scripts/site/local-manager.bro b/scripts/site/local-manager.bro deleted file mode 100644 index 5e6005f21e..0000000000 --- a/scripts/site/local-manager.bro +++ /dev/null @@ -1 +0,0 @@ -##! Local site policy loaded only by the manager if Bro is running as a cluster. diff --git a/scripts/site/local-proxy.bro b/scripts/site/local-proxy.bro deleted file mode 100644 index 478ba6d048..0000000000 --- a/scripts/site/local-proxy.bro +++ /dev/null @@ -1 +0,0 @@ -##! Local site policy loaded only by the proxies if Bro is running as a cluster. diff --git a/scripts/site/local-worker.bro b/scripts/site/local-worker.bro deleted file mode 100644 index b2a100e135..0000000000 --- a/scripts/site/local-worker.bro +++ /dev/null @@ -1 +0,0 @@ -##! Local site policy loaded only by the workers if Bro is running as a cluster. \ No newline at end of file