Fixed cmd.wait

freifunkMUC · May 1, 2021 · 01509fb · 01509fb
1 parent 68a6cf3
commit 01509fb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -28,7 +28,7 @@ nginx:
 
 # Test configuration before reload
 nginx-configtest:
-  cmd.wait:
+  cmd.run:
     - name: /usr/sbin/nginx -t
 
 # Disable default configuration