salt config changes

srv/salt/common/init.sls

@@ -1,3 +1,10 @@
+extra-repos:
+  pkgrepo.managed:
+    - ppa: chris-lea/python-redis
+    - ppa: brianmercer/redis
+    - ppa: chris-lea/node.js
+    - ppa: nginx/stable
+
 common-pkgs:
   pkg.installed:
     - pkgs:
@@ -18,4 +25,6 @@ common-pkgs:
       - pkg-config
       - curl
       - libxml2-dev
-      - libxslt-dev
+      - libxslt-dev
+    - require:
+      - pkgrepo.managed: extra-repos

srv/salt/nodejs/init.sls

@@ -1,9 +1,13 @@
-node-repos:
-  pkgrepo.managed:
-    - ppa: chris-lea/node.js
-
 nodejs:
-  pkg:
-  - installed
-  - require:
-    - pkgrepo.managed: node-repos
+  pkg.installed
+
+nodejs-dev:
+  pkg.installed
+
+npm:
+  pkg.installed
+
+bower:
+  npm.installed:
+    - require:
+      - pkg.installed: npm

srv/salt/realms/init.sls

@@ -1,17 +1,40 @@
-python-pkgs:
-  pkg.installed:
-    - pkgs:
-      - python-dev
-      - python-pip
-      - build-essential
+python-dev:
+  pkg.installed
 
+python-pip:
+  pkg.installed
 
-{% for pkg in ['closure', 'ghdiff', 'tornado', 'pyzmq', 'itsdangerous', 'boto', 'redis', 'simplejson', 'sockjs-tornado', 'flask', 'flask-bcrypt', 'flask-login', 'flask-assets', 'gittle', 'gevent', 'lxml', 'markdown2', 'recaptcha-client', 'RethinkORM' ] %}
-{{ pkg }}-pip:
-  pip:
-    - name: {{ pkg }}
-    - installed
+build-essential:
+  pkg.installed
+
+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
+
+realms-link:
+  cmd.run:
+    - onlyif: test -e /vagrant
+    - name: ln -s /vagrant /home/deploy/realms
+
+/home/deploy/virtualenvs/realms:
+  file.directory:
+    - user: deploy
+    - group: deploy
+    - makedirs: True
+    - recurse:
+      - user
+      - group
     - require:
-      - pkg.installed: common-pkgs
-      - pkg.installed: rethinkdb
-{% endfor %}
+      - user.present: deploy
+  virtualenv.managed:
+    - name: /home/deploy/virtualenvs/realms
+    - requirements: /home/deploy/realms/requirements.txt
+    - watch:
+      - git: realms-repo
+    - require:
+      - file.directory: /home/deploy/virtualenvs/realms

srv/salt/redis/init.sls

@@ -1,8 +1,3 @@
-redis-repos:
-  pkgrepo.managed:
-    - ppa: chris-lea/python-redis
-    - ppa: brianmercer/redis
-
 redis-server:
   pkg:
     - installed
@@ -11,5 +6,4 @@ redis-server:
     - enable: True
     - reload: True
     - require:
-      - pkg: redis-server
-      - pkgrepo.managed: redis-repos
+      - pkg: redis-server

srv/salt/rethinkdb/init.sls

@@ -9,12 +9,6 @@ rethinkdb:
   pkg:
     - installed
 
-python-pip:
-  pkg.installed
-
-build-essential:
-  pkg.installed
-
 rethinkdb-pip:
   pip:
     - name: rethinkdb

srv/salt/supervisor/supervisord.conf

@@ -25,8 +25,8 @@ nocleanup = true
 childlogdir = /tmp
 strip_ansi = false
 
-[program:reimagine]
-command=/usr/bin/python /vagrant/app.py
+[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

srv/salt/top.sls

@@ -2,6 +2,7 @@ base:
   '*':
     - common
     - users
+    - nodejs
     - redis
     - nginx
     - rethinkdb

srv/salt/users/init.sls

@@ -4,12 +4,6 @@ deploy:
     - home: /home/deploy
     - fullname: Deploy
 
-scragg:
-  user.present:
-    - fullname: Matthew Scragg
-    - shell: /bin/bash
-    - home: /home/scragg
-
 sudo:
   pkg:
     - installed

srv/salt/users/mysudoers

@@ -1,2 +1 @@
-deploy ALL=(ALL) NOPASSWD:ALL
-mrobinson ALL=(ALL) NOPASSWD:ALL
+deploy ALL=(ALL) NOPASSWD:ALL