salt changes

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

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

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
+      - file.managed: /etc/supervisor/conf.d/realms.conf