Quellcode durchsuchen

change the restart, it was not effective before

tags/v0.6.2
Clément Mercier vor 8 Jahren
Ursprung
Commit
588bf5efcf
4 geänderte Dateien mit 19 neuen und 9 gelöschten Zeilen
  1. +2
    -2
      firewalld/config.sls
  2. +13
    -2
      firewalld/init.sls
  3. +2
    -2
      firewalld/services.sls
  4. +2
    -3
      firewalld/zones.sls

+ 2
- 2
firewalld/config.sls Datei anzeigen

@@ -13,7 +13,7 @@ directory_firewalld:
- require:
- pkg: package_firewalld # make sure package is installed
- listen_in:
- service: service_firewalld # restart service
- module: service_firewalld # restart service

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


+ 13
- 2
firewalld/init.sls Datei anzeigen

@@ -24,7 +24,7 @@ package_firewalld:
pkg.installed:
- name: {{ firewalld.package }}

service_firewalld:
service_firewalld_running:
service.running:
- name: {{ firewalld.service }}
- enable: True # start on boot
@@ -33,8 +33,19 @@ service_firewalld:
- file: config_firewalld
- service: iptables # ensure it's stopped
- service: ip6tables # ensure it's stopped
{% else %}
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:
- name: {{ firewalld.service }}
- enable: False # don't start on boot

+ 2
- 2
firewalld/services.sls Datei anzeigen

@@ -13,7 +13,7 @@ directory_firewalld_services:
- require:
- pkg: package_firewalld # make sure package is installed
- listen_in:
- service: service_firewalld # restart service
- module: service_firewalld # restart service


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

+ 2
- 3
firewalld/zones.sls Datei anzeigen

@@ -13,8 +13,7 @@ directory_firewalld_zones:
- require:
- pkg: package_firewalld # make sure package is installed
- listen_in:
- service: service_firewalld # restart service
- module: service_firewalld # restart service

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

Laden…
Abbrechen
Speichern