merge master

vccw-team · Jun 9, 2015 · 7da6b9e · 7da6b9e
2 parents b84abd7 + ab9e2c8
commit 7da6b9e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 .idea/
 .vagrant
 Movefile
+vendor
 www
diff --git a/Vagrantfile b/Vagrantfile
@@ -45,6 +45,9 @@ Vagrant.configure(2) do |config|
     exit 1
   end
 
+  config.vm.define _conf['hostname'] do |v|
+  end
+
   config.vm.box = ENV['wp_box'] || _conf['wp_box']
   config.ssh.forward_agent = true
 
@@ -65,6 +68,7 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.provider :virtualbox do |vb|
+    vb.name = _conf['hostname']
     vb.memory = _conf['memory'].to_i
     vb.cpus = _conf['cpus'].to_i
     if 1 < _conf['cpus'].to_i

diff --git a/provision/default.yml b/provision/default.yml
@@ -16,7 +16,7 @@ cpus: 1
 #
 # Network Settings
 #
-hostname: wordpress.local
+hostname: vccw.dev
 ip: 192.168.33.10
 sync_folder: 'www/wordpress'