Updating to match lastest release of stackstrap-salt

stackstrap · Feb 1, 2014 · bcb6ecb · bcb6ecb
1 parent ef41465
commit bcb6ecb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -14,14 +14,15 @@ salt-call pkg.install git
 cd /tmp
 git clone https://github.com/freesurface/stackstrap-salt.git stackstrap-salt
 cd stackstrap-salt
-git archive master --prefix=/srv/ | (cd /; tar xf -)
+git checkout v2014.2.1
+git archive v2014.2.1 --prefix=/srv/ | (cd /; tar xf -)
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.hostname = "{{ name }}-#{CURRENT_USER}"
 
-  config.vm.box = "precise32"
-  config.vm.box_url = "http://files.vagrantup.com/precise32.box"
+  config.vm.box = "ubuntu1204-stackstrap"
+  config.vm.box_url = "http://boxes.stackstrap.org/virtualbox/ubuntu1204-saltlatest.box"
 
   config.vm.network :public_network
 

diff --git a/salt/root/django.sls b/salt/root/django.sls
@@ -40,7 +40,7 @@ include:
 {{ mysql_user_db(short_name, short_name) }}
 
 {{ nginxsite(short_name, app_user, app_group,
-             template="proxy-django.conf",
+             template="salt://nginx/files/proxy-django.conf",
              server_name="_",
              create_root=False,
              defaults={