reorg

srv/salt/supervisor/init.sls

@@ -1,19 +0,0 @@
-/etc/supervisord.conf:
-  file.managed:
-    - source: salt://supervisor/supervisord.conf
-
-
-supervisor-pip:
-  pip:
-    - name: supervisor
-    - installed
-    - require:
-      - pkg.installed: python-pip
-
-supervisor-run:
-  cmd.run:
-    - unless: test -e /tmp/supervisord.pid
-    - name: /usr/local/bin/supervisord
-    - require:
-      - file.managed: /etc/supervisord.conf
-      - file.managed: /etc/rethinkdb/rdb0.conf

srv/salt/supervisor/supervisord.conf

@@ -1,33 +0,0 @@
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[unix_http_server]
-file = /tmp/supervisor.sock
-chmod = 0777
-
-[supervisorctl]
-serverurl = unix:///tmp/supervisor.sock
-
-[supervisord]
-logfile = /tmp/supervisord.log
-logfile_maxbytes = 50MB
-logfile_backups=10
-loglevel = info
-pidfile = /tmp/supervisord.pid
-nodaemon = false
-minfds = 1024
-minprocs = 200
-umask = 022
-user = root
-identifier = supervisor
-directory = /tmp
-nocleanup = true
-childlogdir = /tmp
-strip_ansi = false
-
-[program:realms]
-command=/home/deploy/virtualenvs/realms/bin/python /home/deploy/realms/app.py
-
-[program:rethinkdb]
-command=/usr/bin/rethinkdb --config-file /etc/rethinkdb/rdb0.conf
-user=root