You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2016/04/01 15:14:57 UTC
incubator-metron git commit: METRON-92: Snort has moved their release
artifacts, breaking deployment (dlyle65535 via cestella) closes
apache/incubator-metron#65
Repository: incubator-metron
Updated Branches:
refs/heads/master 8973c9b58 -> ad3866bdf
METRON-92: Snort has moved their release artifacts, breaking deployment (dlyle65535 via cestella) closes apache/incubator-metron#65
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/ad3866bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/ad3866bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/ad3866bd
Branch: refs/heads/master
Commit: ad3866bdf4b6233950e7803c3c3141f0f859e994
Parents: 8973c9b
Author: dlyle65535 <dl...@gmail.com>
Authored: Fri Apr 1 09:14:33 2016 -0400
Committer: cstella <ce...@gmail.com>
Committed: Fri Apr 1 09:14:33 2016 -0400
----------------------------------------------------------------------
deployment/roles/snort/defaults/main.yml | 25 +++++++++++++++++++++++++
deployment/roles/snort/tasks/daq.yml | 2 +-
deployment/roles/snort/tasks/snort.yml | 23 ++---------------------
deployment/roles/snort/vars/main.yml | 21 ---------------------
4 files changed, 28 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ad3866bd/deployment/roles/snort/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/defaults/main.yml b/deployment/roles/snort/defaults/main.yml
new file mode 100644
index 0000000..6c6c0ea
--- /dev/null
+++ b/deployment/roles/snort/defaults/main.yml
@@ -0,0 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+---
+snort_version: 2.9.8.0-1
+daq_version: 2.0.6-1
+snort_topic: snort
+snort_alert_csv_path: /var/log/snort/alert.csv
+snort_src_url: "https://snort.org/downloads/archive/snort/snort-{{ snort_version }}.src.rpm"
+snort_community_rules_url: "https://www.snort.org/downloads/community/community-rules.tar.gz"
+dag_src_url: "https://snort.org/downloads/snort/daq-{{ daq_version }}.src.rpm"
+
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ad3866bd/deployment/roles/snort/tasks/daq.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/tasks/daq.yml b/deployment/roles/snort/tasks/daq.yml
index 50d2049..c8bd4b0 100644
--- a/deployment/roles/snort/tasks/daq.yml
+++ b/deployment/roles/snort/tasks/daq.yml
@@ -17,7 +17,7 @@
---
- name: Download daq
get_url:
- url: "https://snort.org/downloads/snort/daq-{{ daq_version }}.src.rpm"
+ url: "{{ dag_src_url }}"
dest: "/tmp/daq-{{ daq_version }}.src.rpm"
- name: Build daq
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ad3866bd/deployment/roles/snort/tasks/snort.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/tasks/snort.yml b/deployment/roles/snort/tasks/snort.yml
index b56ca74..6bfecc2 100644
--- a/deployment/roles/snort/tasks/snort.yml
+++ b/deployment/roles/snort/tasks/snort.yml
@@ -15,28 +15,9 @@
# limitations under the License.
#
---
-- name: Download daq
- get_url:
- url: "https://snort.org/downloads/snort/daq-{{ daq_version }}.src.rpm"
- dest: "/tmp/daq-{{ daq_version }}.src.rpm"
-
-- name: Build daq
- shell: "rpmbuild --rebuild daq-{{ daq_version }}.src.rpm"
- args:
- chdir: /tmp
- creates: /root/rpmbuild/RPMS/x86_64/daq-{{ daq_version }}.x86_64.rpm
-
-- name: Install daq
- yum:
- name: /root/rpmbuild/RPMS/x86_64/daq-{{ daq_version }}.x86_64.rpm
- register: result
- until: result.rc == 0
- retries: 5
- delay: 10
-
- name: Download snort
get_url:
- url: "https://snort.org/downloads/snort/snort-{{ snort_version }}.src.rpm"
+ url: "{{ snort_src_url }}"
dest: "/tmp/snort-{{ snort_version }}.src.rpm"
- name: Build snort
@@ -55,7 +36,7 @@
- name: Download snort community rules
get_url:
- url: "https://www.snort.org/downloads/community/community-rules.tar.gz"
+ url: "{{ snort_community_rules_url }}"
dest: "/tmp/community-rules.tar.gz"
- name: Extract tarball
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ad3866bd/deployment/roles/snort/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/vars/main.yml b/deployment/roles/snort/vars/main.yml
deleted file mode 100644
index df66171..0000000
--- a/deployment/roles/snort/vars/main.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
----
-snort_version: 2.9.8.0-1
-daq_version: 2.0.6-1
-snort_topic: snort
-snort_alert_csv_path: /var/log/snort/alert.csv