diff --git a/.gitignore b/.gitignore index 00495dc9..3a7eb58 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/nbproject \ No newline at end of file +/nbproject +.vagrant/ diff --git a/README.md b/README.md index c8cdcc0..891481f 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,13 @@ Spawn os environments , 12.04 32bit -> $ vagrant up zpanel_12.04ubuntu32 64bit -> $ vagrant up zpanel_12.04ubuntu64 + 12.10 32bit -> $ vagrant up ubuntu12_10-32 + + 14.04 + 32bit -> $ vagrant up zpanel_14.04ubuntu32 + 64bit -> $ vagrant up zpanel_14.04ubuntu64 #### centos 6.4 32bit -> $ vagrant up zpanel_6.4centos32 diff --git a/Vagrantfile b/Vagrantfile index cc5ef97..c73857e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -72,7 +72,31 @@ Vagrant.configure("2") do |config| # custom virtual machine setup vb.hostname = "zp32ubuntu" end - end # end config + end # end define + +##### Ubuntu 14.04 vagrant + +# ubuntu 14.04 32bit # IP : 192.168.33.15 + config.vm.define 'zpanel_14.04ubuntu32' do |config| + config.vm.box = "ubuntu14_04-32" + config.vm.network :private_network, ip: "192.168.33.15" + config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-i386-vagrant-disk1.box" + config.vm.provider :virtualbox do |vb| + # custom virtual machine setup + vb.hostname = "zp32ubuntu" + end + end # end define +# ubuntu 14.04 64bit # IP : 192.168.33.16 + config.vm.define 'zpanel_14.04ubuntu64' do |config| + config.vm.box = "ubuntu14_04-64" + config.vm.network :private_network, ip: "192.168.33.16" + config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" + config.vm.provider :virtualbox do |vb| + # custom virtual machine setup + vb.hostname = "zp64ubuntu" + end + end # end define +### end end # Toplevel end