saltstack-formulas/firewalld-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change the restart, it was not effective before

Browse Source
This commit is contained in:
Clément Mercier 2016-03-16 17:49:24 +01:00
parent bbe8e33364
commit 588bf5efcf
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firewalld/config.sls
View File

@ -13,7 +13,7 @@ directory_firewalld:
- require: - require:
- pkg: package_firewalld # make sure package is installed - pkg: package_firewalld # make sure package is installed
- listen_in: - listen_in:
- service: service_firewalld # restart service - module: service_firewalld # restart service
config_firewalld: config_firewalld:
file.managed: file.managed:
@ -27,5 +27,5 @@ config_firewalld:
- pkg: package_firewalld # make sure package is installed - pkg: package_firewalld # make sure package is installed
- file: directory_firewalld - file: directory_firewalld
- listen_in: - listen_in:
- service: service_firewalld # restart service - module: service_firewalld # restart service

15
firewalld/init.sls
View File

@ -24,7 +24,7 @@ package_firewalld:
pkg.installed: pkg.installed:
- name: {{ firewalld.package }} - name: {{ firewalld.package }}
service_firewalld: service_firewalld_running:
service.running: service.running:
- name: {{ firewalld.service }} - name: {{ firewalld.service }}
- enable: True # start on boot - enable: True # start on boot
@ -33,8 +33,19 @@ service_firewalld:
- file: config_firewalld - file: config_firewalld
- service: iptables # ensure it's stopped - service: iptables # ensure it's stopped
- service: ip6tables # ensure it's stopped - service: ip6tables # ensure it's stopped
{% else %}
service_firewalld: service_firewalld:
module.wait:
- name: service.restart
- m_name: {{ firewalld.service }}
- require:
- pkg: package_firewalld
- file: config_firewalld
- service: iptables # ensure it's stopped
- service: ip6tables # ensure it's stopped
{% else %}
service_firewalld_dead:
service.dead: service.dead:
- name: {{ firewalld.service }} - name: {{ firewalld.service }}
- enable: False # don't start on boot - enable: False # don't start on boot

4
firewalld/services.sls
View File

@ -13,7 +13,7 @@ directory_firewalld_services:
- require: - require:
- pkg: package_firewalld # make sure package is installed - pkg: package_firewalld # make sure package is installed
- listen_in: - listen_in:
- service: service_firewalld # restart service - module: service_firewalld # restart service
# == Define: firewalld.services # == Define: firewalld.services
@ -37,7 +37,7 @@ directory_firewalld_services:
- pkg: package_firewalld # make sure package is installed - pkg: package_firewalld # make sure package is installed
- file: directory_firewalld_services - file: directory_firewalld_services
- listen_in: - listen_in:
- service: service_firewalld # restart service - module: service_firewalld # restart service
- context: - context:
name: {{ s_name }} name: {{ s_name }}
service: {{ v }} service: {{ v }}

5
firewalld/zones.sls
View File

@ -13,8 +13,7 @@ directory_firewalld_zones:
- require: - require:
- pkg: package_firewalld # make sure package is installed - pkg: package_firewalld # make sure package is installed
- listen_in: - listen_in:
- service: service_firewalld # restart service - module: service_firewalld # restart service
# == Define: firewalld.zones # == Define: firewalld.zones
# #
@ -35,7 +34,7 @@ directory_firewalld_zones:
- pkg: package_firewalld # make sure package is installed - pkg: package_firewalld # make sure package is installed
- file: directory_firewalld_zones - file: directory_firewalld_zones
- listen_in: - listen_in:
- service: service_firewalld # restart service - module: service_firewalld # restart service
- context: - context:
name: {{ z_name }} name: {{ z_name }}
zone: {{ v }} zone: {{ v }}