From 8e003d6a0e89d0771aad77b212247c391e319bcf Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Fri, 31 Oct 2014 20:43:32 -0400
Subject: [PATCH] More Vagrant stuff.

---
 Makefile                  | 17 +++++++----------
 README.md                 |  2 --
 salt/application/init.sls |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 696b69d..fd5eca2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 pm = /var/www/.virtualenvs/snipt/bin/python /var/www/snipt/manage.py
-ssh-server-deploy = ssh deploy@69.164.221.98 -p 55555
-ssh-server-root = ssh root@69.164.221.98
+ssh-server-deploy = ssh deploy@96.126.110.160 -p 55555
+ssh-server-root = ssh root@96.126.110.160
 ssh-vagrant = ssh vagrant@localhost -p 2222 -i ~/.vagrant.d/insecure_private_key
 
 assets:
@@ -85,9 +85,9 @@ run:
 	@vagrant ssh -c 'sudo supervisorctl restart snipt && sudo supervisorctl tail -f snipt stderr'
 
 salt-server:
-	@scp -q -P 55555 settings_local_server.py deploy@69.164.221.98:/var/www/snipt/settings_local.py
-	@scp -q -P 55555 -r ./salt/ deploy@69.164.221.98:salt
-	@scp -q -P 55555 -r ./pillar/ deploy@69.164.221.98:pillar
+	@scp -q -P 55555 settings_local_server.py deploy@96.126.110.160:/var/www/snipt/settings_local.py
+	@scp -q -P 55555 -r ./salt/ deploy@96.126.110.160:salt
+	@scp -q -P 55555 -r ./pillar/ deploy@96.126.110.160:pillar
 	@$(ssh-server-deploy) 'sudo rm -rf /srv'
 	@$(ssh-server-deploy) 'sudo mkdir /srv'
 	@$(ssh-server-deploy) 'sudo mv ~/salt /srv/salt'
@@ -110,15 +110,13 @@ server:
 	@$(ssh-server-root) 'sudo add-apt-repository -y ppa:saltstack/salt'
 	@$(ssh-server-root) 'sudo apt-get update'
 	@$(ssh-server-root) 'sudo apt-get install -y salt-minion'
-	@scp -q -r ./salt/ root@69.164.221.98:salt
-	@scp -q -r ./pillar/ root@69.164.221.98:pillar
+	@scp -q -r ./salt/ root@96.126.110.160:salt
+	@scp -q -r ./pillar/ root@96.126.110.160:pillar
 	@$(ssh-server-root) 'sudo rm -rf /srv'
 	@$(ssh-server-root) 'sudo mkdir /srv'
 	@$(ssh-server-root) 'sudo mv ~/salt /srv/salt'
 	@$(ssh-server-root) 'sudo mv ~/pillar /srv/pillar'
 	@$(ssh-server-root) 'sudo salt-call --local state.highstate'
-
-server-init:
 	@$(ssh-server-deploy) 'cd /var/www/snipt; make db;'
 	@$(ssh-server-deploy) '$(pm) syncdb --noinput;'
 	@$(ssh-server-deploy) '$(pm) migrate;'
@@ -154,6 +152,5 @@ vagrant:
 	provision-vagrant, \
 	salt-server, \
 	salt-vagrant, \
-	server-init, \
 	server, \
 	vagrant
diff --git a/README.md b/README.md
index 8dd036b..59bd985 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,6 @@ Install [Vagrant](https://www.vagrantup.com/) and either [VirtualBox](https://ww
 3. Edit local server settings (choose a database password - you'll be prompted for it).
 4. Manually change the VM IP address in the Makefile.
 5. `make server`
-6. SSH into the server, `sudo su - deploy`, `ssh-keygen`, and add the public key to your repo as a deploy key.
-7. `make server-init`
 
 # Deploying to Heroku
 
diff --git a/salt/application/init.sls b/salt/application/init.sls
index 52bc00f..5f822db 100644
--- a/salt/application/init.sls
+++ b/salt/application/init.sls
@@ -32,7 +32,7 @@ virtualenvwrapper:
       - group: deploy
 
   git.latest:
-    - name: git@github.com:nicksergeant/snipt.git
+    - name: https://github.com/nicksergeant/snipt.git
     - target: /var/www/snipt
     - user: deploy