Repository: metron Updated Branches: refs/heads/master 62de8bd8f -> 5c41bf7f3
METRON-1261 Apply bro security patch (JonZeolla via ottobackwards) closes apache/metron#805 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/5c41bf7f Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/5c41bf7f Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/5c41bf7f Branch: refs/heads/master Commit: 5c41bf7f39064c31fa12766adbb8b66edfe3bcae Parents: 62de8bd Author: JonZeolla <[email protected]> Authored: Fri Oct 27 13:02:16 2017 -0400 Committer: otto <[email protected]> Committed: Fri Oct 27 13:02:16 2017 -0400 ---------------------------------------------------------------------- metron-deployment/inventory/full-dev-platform/group_vars/all | 2 +- .../inventory/quick-dev-platform/group_vars/all | 2 +- .../other-examples/manual-install/Manual_Install_CentOS6.md | 8 ++++---- metron-deployment/playbooks/docker_probe_install.yml | 2 +- metron-deployment/roles/bro/tasks/bro.yml | 2 +- metron-deployment/roles/bro/vars/main.yml | 2 +- metron-deployment/roles/snort/files/snort.conf | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/5c41bf7f/metron-deployment/inventory/full-dev-platform/group_vars/all ---------------------------------------------------------------------- diff --git a/metron-deployment/inventory/full-dev-platform/group_vars/all b/metron-deployment/inventory/full-dev-platform/group_vars/all index 828c946..9aa04ab 100644 --- a/metron-deployment/inventory/full-dev-platform/group_vars/all +++ b/metron-deployment/inventory/full-dev-platform/group_vars/all @@ -42,7 +42,7 @@ enrichment_hbase_table: enrichment # metron metron_version: 0.4.2 metron_directory: /usr/metron/{{ metron_version }} -bro_version: "2.4.1" +bro_version: "2.4.2" fixbuf_version: "1.7.1" yaf_version: "2.8.0" daq_version: "2.0.6-1" http://git-wip-us.apache.org/repos/asf/metron/blob/5c41bf7f/metron-deployment/inventory/quick-dev-platform/group_vars/all ---------------------------------------------------------------------- diff --git a/metron-deployment/inventory/quick-dev-platform/group_vars/all b/metron-deployment/inventory/quick-dev-platform/group_vars/all index 2a1ea80..28f235d 100644 --- a/metron-deployment/inventory/quick-dev-platform/group_vars/all +++ b/metron-deployment/inventory/quick-dev-platform/group_vars/all @@ -41,7 +41,7 @@ enrichment_hbase_table: enrichment # metron metron_version: 0.4.2 metron_directory: /usr/metron/{{ metron_version }} -bro_version: "2.4.1" +bro_version: "2.4.2" fixbuf_version: "1.7.1" yaf_version: "2.8.0" daq_version: "2.0.6-1" http://git-wip-us.apache.org/repos/asf/metron/blob/5c41bf7f/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.md ---------------------------------------------------------------------- diff --git a/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.md b/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.md index 052086d..aeb75eb 100644 --- a/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.md +++ b/metron-deployment/other-examples/manual-install/Manual_Install_CentOS6.md @@ -616,9 +616,9 @@ Log out and log in to make sure Python is back to version 2.6 instead of 2.7. ``` Install bro: ``` -# wget -O /tmp/bro-2.4.1.tar.gz https://www.bro.org/downloads/release/bro-2.4.1.tar.gz -# /bin/gtar --extract -C /tmp -z -f /tmp/bro-2.4.1.tar.gz -# cd /tmp/bro-2.4.1 +# wget -O /tmp/bro-2.4.2.tar.gz https://www.bro.org/downloads/bro-2.4.2.tar.gz +# /bin/gtar --extract -C /tmp -z -f /tmp/bro-2.4.2.tar.gz +# cd /tmp/bro-2.4.2 # ./configure --prefix=/usr/local/bro # make -j4 # make install @@ -641,7 +641,7 @@ bro-kafka: # cp -r /root/metron/metron-sensors/bro-plugin-kafka /tmp # cd /tmp/bro-plugin-kafka # rm -rf build/ -# ./configure --bro-dist=/tmp/bro-2.4.1 --install-root=/usr/local/bro/lib/bro/plugins/ --with-librdkafka=/usr/local +# ./configure --bro-dist=/tmp/bro-2.4.2 --install-root=/usr/local/bro/lib/bro/plugins/ --with-librdkafka=/usr/local # make -j4 # make install ``` http://git-wip-us.apache.org/repos/asf/metron/blob/5c41bf7f/metron-deployment/playbooks/docker_probe_install.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/playbooks/docker_probe_install.yml b/metron-deployment/playbooks/docker_probe_install.yml index 75ae31f..a58ea52 100644 --- a/metron-deployment/playbooks/docker_probe_install.yml +++ b/metron-deployment/playbooks/docker_probe_install.yml @@ -32,7 +32,7 @@ vars: metron_version: 0.4.2 metron_directory: /usr/metron/{{ metron_version }} - bro_version: "2.4.1" + bro_version: "2.4.2" fixbuf_version: "1.7.1" yaf_version: "2.8.0" daq_version: "2.0.6-1" http://git-wip-us.apache.org/repos/asf/metron/blob/5c41bf7f/metron-deployment/roles/bro/tasks/bro.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/roles/bro/tasks/bro.yml b/metron-deployment/roles/bro/tasks/bro.yml index f6ef837..d751674 100644 --- a/metron-deployment/roles/bro/tasks/bro.yml +++ b/metron-deployment/roles/bro/tasks/bro.yml @@ -17,7 +17,7 @@ --- - name: Download bro get_url: - url: "https://www.bro.org/downloads/release/bro-{{ bro_version }}.tar.gz" + url: "https://www.bro.org/downloads/bro-{{ bro_version }}.tar.gz" dest: "/tmp/bro-{{ bro_version }}.tar.gz" - name: Extract bro tarball http://git-wip-us.apache.org/repos/asf/metron/blob/5c41bf7f/metron-deployment/roles/bro/vars/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/roles/bro/vars/main.yml b/metron-deployment/roles/bro/vars/main.yml index 2ff5177..9519807 100644 --- a/metron-deployment/roles/bro/vars/main.yml +++ b/metron-deployment/roles/bro/vars/main.yml @@ -16,7 +16,7 @@ # --- bro_home: /usr/local/bro -bro_version: 2.4.1 +bro_version: 2.4.2 bro_daemon_log: /var/log/bro.log bro_topic: bro http://git-wip-us.apache.org/repos/asf/metron/blob/5c41bf7f/metron-deployment/roles/snort/files/snort.conf ---------------------------------------------------------------------- diff --git a/metron-deployment/roles/snort/files/snort.conf b/metron-deployment/roles/snort/files/snort.conf index a6edb09..b03247a 100644 --- a/metron-deployment/roles/snort/files/snort.conf +++ b/metron-deployment/roles/snort/files/snort.conf @@ -147,7 +147,7 @@ config checksum_mode: all # config ignore_ports: tcp 21 6667:6671 1356 # config ignore_ports: udp 1:17 53 -# Configure active response for non inline operation. For more information, see REAMDE.active +# Configure active response for non inline operation. For more information, see README.active # config response: eth0 attempts 2 # Configure DAQ related options for inline operation. For more information, see README.daq
