From ac8f494b257da40edefef3c4ee92eb81b945981d Mon Sep 17 00:00:00 2001
From: Forrest Alvarez <forrest@flowroute.com>
Date: Wed, 14 May 2014 15:30:37 -0700
Subject: [PATCH] Removed the config from the init and put it into it's own
 state. This helps avoid issues where we might need more than one memcached
 config.

---
 memcached/config.sls | 13 +++++++++++++
 memcached/init.sls   | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 memcached/config.sls

diff --git a/memcached/config.sls b/memcached/config.sls
new file mode 100644
index 0000000..f495c70
--- /dev/null
+++ 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
diff --git a/memcached/init.sls b/memcached/init.sls
index cbefb44..ad4af5b 100644
--- 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
\ No newline at end of file