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

* origin/topic/dnthayer/ticket1700-part2:
  Remove the node-specific local-*.bro scripts

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

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
 ------------------------
 

VERSION

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

aux/broctl

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

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)

scripts/site/local-logger.bro

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

scripts/site/local-manager.bro

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

scripts/site/local-proxy.bro

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

scripts/site/local-worker.bro

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