assets

srv/salt/realms/init.sls

@@ -18,18 +18,27 @@ bower:
     - require:
       - pkg.installed: common-pkgs
 
-realms-repo:
-  git.latest:
-    - unless: test -e /vagrant
-    - name: git@github.com:scragg0x/realms.git
-    - target: /home/deploy
-    - rev: master
-    - user: deploy
-    - identity: /home/deploy/.ssh/id_rsa
+uglify-js:
+  npm.installed:
+    - user: root
+    - require:
+      - pkg.installed: common-pkgs
 
-/home/deploy/virtualenvs/realms:
+create_virtualenv:
   virtualenv.managed:
+    - name: /home/deploy/virtualenvs/realms
     - requirements: /home/deploy/realms/requirements.txt
     - cwd: /home/deploy/realms
-    - user: deploy
+    - user: root
 
+vagrant_ownership:
+  cmd.run:
+    - name: chown -R vagrant.vagrant /home/deploy
+    - onlyif: test -d /vagrant
+    - user: root
+
+deploy_ownership:
+  cmd.run:
+    - name: chown -R vagrant.vagrant /home/deploy
+    - unless: test -d /vagrant
+    - user: root

srv/salt/supervisor/init.sls

@@ -1,10 +1,3 @@
 /etc/supervisor/conf.d/realms.conf:
   file.managed:
-    - source: salt://supervisor/supervisord.conf
-
-supervisor-run:
-  cmd.run:
-    - unless: test -e /tmp/supervisord.pid
-    - name: /usr/local/bin/supervisord
-    - require:
-      - file.managed: /etc/supervisor/conf.d/realms.conf
+    - source: salt://supervisor/supervisord.conf

srv/salt/supervisor/supervisord.conf

@@ -1,2 +1,3 @@
 [program:realms]
-command=/home/deploy/virtualenvs/realms/bin/python /home/deploy/realms/manage.py server
+user=deploy
+command=/home/deploy/realms/virtualenvs/realms/bin/python /home/deploy/realms/manage.py server