init.sls in salted-rails-0.0.5

- old
+ new

@@ -15,11 +15,11 @@
   cmd.wait:
     - name: "echo 'invoke-rc.d salt-minion restart'|at now + 1 min"
     - order: last
     - watch:
       - pkg: salt-minion
-      - file: /etc/salt/minion
+      #- file: /etc/salt/minion
       - file: /etc/salt/minion.d
     - require:
       - pkg: at
 
 salt-minion:
@@ -28,22 +28,23 @@
     - enable: True
   pkg.installed:
     - names:
       - salt-minion
       - at
-  file.managed:
-    - name: /etc/salt/minion
-    - owner: root
-    - group: root
-    - mode: 0644
-    - source: salt://salt/minion/config.template
-    - template: jinja
-    - context:
-      master: salt
-      file_roots:
-        base:
-          - /srv/salt/private
-          - /srv/salt/base
-      pillar_roots:
-        base:
-          - /srv/salt/private/pillar
-          - /srv/salt/base/pillar
+#  Don't want to override minion copied in by vagrant!
+#  file.managed:
+#    - name: /etc/salt/minion
+#    - owner: root
+#    - group: root
+#    - mode: 0644
+#    - source: salt://salt/minion/config.template
+#    - template: jinja
+#    - context:
+#      master: salt
+#      file_roots:
+#        base:
+#          - /srv/salt/private
+#          - /srv/salt/base
+#      pillar_roots:
+#        base:
+#          - /srv/salt/private/pillar
+#          - /srv/salt/base/pillar