Merge branch 'reposync' of https://github.com/Security-Onion-Solutions/securityonion into reposync

salt/firewall/init.sls

@@ -1,6 +1,11 @@
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls in allowed_states %}
 
+disable_firewalld:
+  service.dead:
+    - name: firewalld
+    - enable: False
+
 create_sysconfig_iptables:
   file.touch:
     - name: /etc/sysconfig/iptables