|
@@ -1,17 +1,22 @@
|
|
Vagrant.configure("2") do |config|
|
|
Vagrant.configure("2") do |config|
|
|
|
|
|
|
- config.vm.box = "precise64"
|
|
|
|
- config.vm.box_url = "http://files.vagrantup.com/precise64.box"
|
|
|
|
|
|
+ config.vm.box = "ubuntu/precise64"
|
|
|
|
|
|
config.vm.network :private_network, ip: "10.10.10.10"
|
|
config.vm.network :private_network, ip: "10.10.10.10"
|
|
config.ssh.forward_agent = true
|
|
config.ssh.forward_agent = true
|
|
|
|
|
|
|
|
+ # http://foo-o-rama.com/vagrant--stdin-is-not-a-tty--fix.html
|
|
|
|
+ config.vm.provision "fix-no-tty", type: "shell" do |s|
|
|
|
|
+ s.privileged = false
|
|
|
|
+ s.inline = "sudo sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n/' /root/.profile"
|
|
|
|
+ end
|
|
|
|
+
|
|
config.vm.provider :virtualbox do |vb|
|
|
config.vm.provider :virtualbox do |vb|
|
|
vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
|
|
vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
|
|
- vb.customize ["modifyvm", :id, "--memory", 512]
|
|
|
|
|
|
+ vb.customize ["modifyvm", :id, "--memory", 1024]
|
|
vb.customize ["modifyvm", :id, "--cpus", 2]
|
|
vb.customize ["modifyvm", :id, "--cpus", 2]
|
|
end
|
|
end
|
|
|
|
|
|
config.vm.provision :shell, :path => "server_config/server_install.sh"
|
|
config.vm.provision :shell, :path => "server_config/server_install.sh"
|
|
|
|
|
|
-end
|
|
|
|
|
|
+end
|