From 9492f999435c14282de60d6ae9fd3d3299cc748f Mon Sep 17 00:00:00 2001
From: Matthew Scragg <scragg@gmail.com>
Date: Thu, 16 Jan 2014 16:15:25 -0600
Subject: [PATCH] salt changes

---
 requirements.txt             | 1 -
 srv/salt/common/init.sls     | 1 +
 srv/salt/supervisor/init.sls | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 33e27cf..d3a66dd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,6 @@ recaptcha-client==1.0.6
 redis==2.8.0
 simplejson==3.3.1
 sockjs-tornado==1.0.0
-supervisor==3.0
 SQLAlchemy==0.8.3
 tornado==3.1.1
 tldextract==1.2.2
diff --git a/srv/salt/common/init.sls b/srv/salt/common/init.sls
index 10df4f6..02ae2f7 100644
--- a/srv/salt/common/init.sls
+++ b/srv/salt/common/init.sls
@@ -44,6 +44,7 @@ common-pkgs:
       - libxml2-dev
       - libxslt1-dev
       - nodejs
+      - supervisor
     - require:
       - pkgrepo.managed: nodejs-lea-repo
       - pkgrepo.managed: redis-lea-repo
diff --git a/srv/salt/supervisor/init.sls b/srv/salt/supervisor/init.sls
index dab0896..a79568f 100644
--- a/srv/salt/supervisor/init.sls
+++ b/srv/salt/supervisor/init.sls
@@ -1,4 +1,4 @@
-/etc/conf.d/realms.conf:
+/etc/supervisor/conf.d/realms.conf:
   file.managed:
     - source: salt://supervisor/supervisord.conf
 
@@ -14,4 +14,4 @@ supervisor-run:
     - unless: test -e /tmp/supervisord.pid
     - name: /usr/local/bin/supervisord
     - require:
-      - file.managed: /etc/conf.d/realms.conf
\ No newline at end of file
+      - file.managed: /etc/supervisor/conf.d/realms.conf
\ No newline at end of file