From 22ad7db7c0c756083d6a0ace1f7c6b0718a829da Mon Sep 17 00:00:00 2001
From: "a.genus" <genus.alexey@gmail.com>
Date: Wed, 14 Jun 2017 18:35:00 +0300
Subject: [PATCH 1/2] Add restart minion via at (fixes #136)

---
 salt/defaults.yaml |  1 +
 salt/minion.sls    | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/salt/defaults.yaml b/salt/defaults.yaml
index 8a82d80..ae984d4 100644
--- a/salt/defaults.yaml
+++ b/salt/defaults.yaml
@@ -4,6 +4,7 @@ salt:
   install_packages: True
   use_pip: False
   clean_config_d_dir: True
+  restart_via_at: False
 
   config_path: /etc/salt
 
diff --git a/salt/minion.sls b/salt/minion.sls
index 9d141b7..cff8724 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -16,12 +16,30 @@ salt-minion:
   service.running:
     - enable: True
     - name: {{ salt_settings.minion_service }}
+{%- if not salt_settings.restart_via_at %}
     - watch:
-{% if salt_settings.install_packages %}
+  {%- if salt_settings.install_packages %}
       - pkg: salt-minion
-{% endif %}
+  {%- endif %}
       - file: salt-minion
       - file: remove-old-minion-conf-file
+{%- else %}
+at:
+  pkg.installed: []
+
+restart-salt-minion:
+  cmd.wait:
+    - name: echo salt-call --local service.restart salt-minion | at now + 1 minute
+    - order: last
+    - reqiure:
+        - pkg: at
+    - watch:
+  {%- if salt_settings.install_packages %}
+      - pkg: salt-minion
+  {%- endif %}
+      - file: salt-minion
+      - file: remove-old-minion-conf-file
+{%- endif %}
 
 {% if salt_settings.minion_remove_config %}
 remove-default-minion-conf-file:

From 0e8573d13a5c1ab7fa2d1e7399442ac135ad5dbb Mon Sep 17 00:00:00 2001
From: "a.genus" <genus.alexey@gmail.com>
Date: Thu, 15 Jun 2017 13:30:30 +0300
Subject: [PATCH 2/2] Fix typo

---
 salt/minion.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/minion.sls b/salt/minion.sls
index cff8724..852ebe2 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -31,7 +31,7 @@ restart-salt-minion:
   cmd.wait:
     - name: echo salt-call --local service.restart salt-minion | at now + 1 minute
     - order: last
-    - reqiure:
+    - require:
         - pkg: at
     - watch:
   {%- if salt_settings.install_packages %}