METRON-92: Snort has moved their release artifacts, breaking deployment (dlyle65535 via cestella) closes apache/incubator-metron#65
diff --git a/deployment/roles/snort/vars/main.yml b/deployment/roles/snort/defaults/main.yml
similarity index 77%
rename from deployment/roles/snort/vars/main.yml
rename to deployment/roles/snort/defaults/main.yml
index df66171..6c6c0ea 100644
--- a/deployment/roles/snort/vars/main.yml
+++ b/deployment/roles/snort/defaults/main.yml
@@ -19,3 +19,7 @@
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"
+
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
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
