From 0384023c7a9943ef80e7226c9f472886a0709aaf Mon Sep 17 00:00:00 2001 From: trojanspike Date: Tue, 22 Apr 2014 11:14:01 +0100 Subject: [PATCH 1/4] Add vagrant options for ubuntu 14.04 , 32&64 bit --- Vagrantfile | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index cc5ef97..04d7d8e 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 |ubuntu32| + ubuntu32.vm.box = "ubuntu14_04-32" + ubuntu32.vm.network :private_network, ip: "192.168.33.15" + ubuntu32.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-i386-vagrant-disk1.box" + ubuntu32.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 |ubuntu32| + ubuntu32.vm.box = "ubuntu14_04-64" + ubuntu32.vm.network :private_network, ip: "192.168.33.16" + ubuntu32.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" + ubuntu32.vm.provider :virtualbox do |vb| + # custom virtual machine setup + vb.hostname = "zp64ubuntu" + end + end # end define +### end end # Toplevel end From 19edcad6625420f20d59a4f2341964054dc7750a Mon Sep 17 00:00:00 2001 From: trojanspike Date: Tue, 22 Apr 2014 11:32:58 +0100 Subject: [PATCH 2/4] config instance --- Vagrantfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 04d7d8e..c73857e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -77,21 +77,21 @@ Vagrant.configure("2") do |config| ##### Ubuntu 14.04 vagrant # ubuntu 14.04 32bit # IP : 192.168.33.15 - config.vm.define 'zpanel_14.04ubuntu32' do |ubuntu32| - ubuntu32.vm.box = "ubuntu14_04-32" - ubuntu32.vm.network :private_network, ip: "192.168.33.15" - ubuntu32.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-i386-vagrant-disk1.box" - ubuntu32.vm.provider :virtualbox do |vb| + 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 |ubuntu32| - ubuntu32.vm.box = "ubuntu14_04-64" - ubuntu32.vm.network :private_network, ip: "192.168.33.16" - ubuntu32.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" - ubuntu32.vm.provider :virtualbox do |vb| + 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 From 7682b5ae5dbdfdcc8111442b89c7a08aa01ec55b Mon Sep 17 00:00:00 2001 From: trojanspike Date: Tue, 22 Apr 2014 11:40:09 +0100 Subject: [PATCH 3/4] ignore .vagrant --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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/ From 241fd4eb2e7cc69f114e59132cf57c18e525d0bf Mon Sep 17 00:00:00 2001 From: trojanspike Date: Tue, 22 Apr 2014 11:42:55 +0100 Subject: [PATCH 4/4] Add 14.04 lauch info to readme --- README.md | 5 +++++ 1 file changed, 5 insertions(+) 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