From 01509fb306e8f25efc4389b0c22e58e4c91505ba Mon Sep 17 00:00:00 2001 From: lqb Date: Sat, 1 May 2021 02:24:01 +0200 Subject: [PATCH] Fixed cmd.wait --- bird2/init.sls | 3 +-- certs/init.sls | 3 +-- dns-server/init.sls | 3 +-- locales/init.sls | 6 ++---- nginx/init.sls | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/bird2/init.sls b/bird2/init.sls index d637dc2..b60259e 100644 --- a/bird2/init.sls +++ b/bird2/init.sls @@ -11,9 +11,8 @@ bird: - running: True bird2_configure: - cmd.wait: + cmd.run: - name: /usr/sbin/birdc configure - - watch: [] /etc/bird: file.directory: diff --git a/certs/init.sls b/certs/init.sls index 76a60eb..f6a4256 100644 --- a/certs/init.sls +++ b/certs/init.sls @@ -10,9 +10,8 @@ ssl-cert: pkg.installed update_ca_certificates: - cmd.wait: + cmd.run: - name: /usr/sbin/update-ca-certificates - - watch: [] generate-dhparam: cmd.run: diff --git a/dns-server/init.sls b/dns-server/init.sls index 0d8eacf..ea06279 100644 --- a/dns-server/init.sls +++ b/dns-server/init.sls @@ -19,6 +19,5 @@ dns_pkgs: # Reload command rndc-reload: - cmd.wait: - - watch: [] + cmd.run: - name: /usr/sbin/rndc reload diff --git a/locales/init.sls b/locales/init.sls index 4f35b40..8eda128 100644 --- a/locales/init.sls +++ b/locales/init.sls @@ -13,13 +13,11 @@ locales: - pkg: locales locale-gen: - cmd.wait: - - watch: + cmd.run: + - onchanges: - file: /etc/locale.gen en_US.UTF-8: locale.system: - require: - file: /etc/locale.gen - - diff --git a/nginx/init.sls b/nginx/init.sls index e10778f..b5ebb99 100644 --- a/nginx/init.sls +++ b/nginx/init.sls @@ -28,7 +28,7 @@ nginx: # Test configuration before reload nginx-configtest: - cmd.wait: + cmd.run: - name: /usr/sbin/nginx -t # Disable default configuration