Merge pull request #5 from gravyboat/master

Removed the config from the init and put it into it's own state
2014-05-14 16:48:21 -06:00 · 2014-05-14 16:48:21 -06:00 · a454187d63
commit a454187d63
parent 4e568d78be ac8f494b25
2 changed files with 13 additions and 13 deletions
--- a/memcached/config.sls
+++ b/memcached/config.sls
@ -0,0 +1,13 @@
+include:
+  - memcached
+
+/etc/memcached.conf:
+  file:
+    - managed
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+    - source: salt://memcached/templates/memcached.conf
+    - watch_in:
+      - service: memcached
--- a/memcached/init.sls
+++ b/memcached/init.sls
@ -6,16 +6,3 @@ memcached:
    - enable: True
    - require:
      - pkg: memcached
-    - watch: 
-      - file: /etc/memcached.conf
-  
-/etc/memcached.conf:
-  file:
-    - managed
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - source: salt://memcached/templates/memcached.conf
-    - require:
-      - pkg: memcached