veewee 0.2.3 → 0.3.0.alpha1

data/lib/veewee/vagrant/config.rb

@@ -0,0 +1,7 @@
+module Veewee
+  module Vagrant
+    class BaseBoxConfig < Vagrant::Config::Base
+      configures :basebox
+    end
+  end
+end

data/lib/veewee/version.rb

@@ -1,3 +1,8 @@
+# Initialize the Module Veewee, otherwise it can't be checked
 module Veewee
-  VERSION = "0.2.3"
+end
+
+# Only set the version constant if it wasn't set before
+unless defined?(Veewee::VERSION)
+  ::Veewee::VERSION="0.3.0.alpha1"
 end

data/templates/CentOS-4.8-i386/definition.rb

@@ -1,12 +1,12 @@
-Veewee::Session.declare({
-  :cpu_count => '1', :memory_size=> '384', 
+Veewee::Definition.declare({
+  :cpu_count => '1', :memory_size=> '384',
   :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',:ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat',
   :iso_file => "CentOS-4.8-i386-bin-DVD.iso", :iso_src => "", :iso_md5 => "", :iso_download_timeout => 1000,
   :iso_download_instructions => "This iso is no more available, for instructions see http://isoredirect.centos.org/centos/4/isos/i386/",
   :boot_wait => "10", :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",

data/templates/CentOS-4.8-i386/postinstall.sh

@@ -10,7 +10,7 @@ yum -y install gcc bzip2 make kernel-devel-`uname -r`
 
 yum -y install gcc-c++ zlib-devel openssl-devel readline-devel sqlite3-devel
 
-yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y erase  gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 
 yum -y clean all
 
@@ -30,7 +30,7 @@ rm ruby-enterprise-1.8.7-2010.02.tar.gz
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 #Installing the virtualbox guest additions

data/templates/CentOS-5.5-x86_64-netboot/definition.rb

@@ -3,7 +3,7 @@ Veewee::Session.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat_64',
   :iso_file => "CentOS-5.5-x86_64-netinstall.iso",
-  :iso_src => "http://vault.centos.org/5.5/isos/x86_64/CentOS-5.5-x86_64-netinstall.iso",
+  :iso_src => "http://ftp.hosteurope.de/mirror/centos.org/5.5/isos/x86_64/CentOS-5.5-x86_64-netinstall.iso",
   :iso_md5 => "560a964657c92508ae110a35cb963632",
   :iso_download_timeout => 1000,
   :boot_wait => "10", :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],

data/templates/CentOS-5.5-x86_64-netboot/postinstall.sh

@@ -39,7 +39,7 @@ echo "Installing chef and puppet"
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 #Installing the virtualbox guest additions

data/templates/CentOS-5.6-i386-netboot/definition.rb

@@ -1,14 +1,14 @@
-Veewee::Session.declare({
+Veewee::Definition.declare({
   :cpu_count => '1', :memory_size=> '384',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat',
   :iso_file => "CentOS-5.6-i386-netinstall.iso",
-  :iso_src => "http://vault.centos.org/5.6/isos/i386/CentOS-5.6-i386-netinstall.iso",
+  :iso_src => "http://ftp.hosteurope.de/mirror/centos.org/5.6/isos/i386/CentOS-5.6-i386-netinstall.iso",
   :iso_md5 => "a710105f7f9fe3516f08f6f8514ed2b0",
   :iso_download_timeout => 1000,
   :boot_wait => "10", :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",

data/templates/CentOS-5.6-i386-netboot/ks.cfg

@@ -1,7 +1,7 @@
 # Kickstart file automatically generated by anaconda.
 
 install
-url --url=http://vault.centos.org/5.6/os/i386
+url --url=http://mirror.bytemark.co.uk/centos/5.6/os/i386
 lang en_US.UTF-8
 langsupport --default=en_US.UTF-8 en_US.UTF-8
 keyboard us
@@ -42,4 +42,4 @@ lvm2
 /usr/sbin/groupadd vagrant
 /usr/sbin/useradd vagrant -g vagrant -G wheel
 echo "vagrant"|passwd --stdin vagrant
-echo "vagrant        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers
+echo "vagrant        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers

data/templates/CentOS-5.6-i386-netboot/postinstall.sh

@@ -10,7 +10,7 @@ yum -y install gcc bzip2 make kernel-devel-`uname -r`
 
 yum -y install gcc-c++ zlib-devel openssl-devel readline-devel sqlite3-devel
 
-yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y erase  gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 
 
 yum -y clean all
@@ -31,7 +31,7 @@ rm ruby-enterprise-1.8.7-2010.02.tar.gz
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 #Installing the virtualbox guest additions

data/templates/CentOS-5.6-i386/definition.rb

@@ -1,4 +1,4 @@
-Veewee::Session.declare({
+Veewee::Definition.declare({
   :cpu_count => '1', :memory_size=> '384',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat',
@@ -9,7 +9,7 @@ Veewee::Session.declare({
     'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
   ],
   :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",

data/templates/CentOS-5.6-i386/postinstall.sh

@@ -10,7 +10,7 @@ yum -y install gcc bzip2 make kernel-devel-`uname -r`
 
 yum -y install gcc-c++ zlib-devel openssl-devel readline-devel sqlite3-devel
 
-yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y erase  gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 
 yum -y clean all
 
@@ -30,7 +30,7 @@ rm ruby-enterprise-1.8.7-2010.02.tar.gz
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 #Installing the virtualbox guest additions

data/templates/CentOS-5.6-x86_64-netboot/definition.rb

@@ -1,14 +1,14 @@
-Veewee::Session.declare({
+Veewee::Definition.declare({
   :cpu_count => '1', :memory_size=> '384',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat_64',
   :iso_file => "CentOS-5.6-x86_64-netinstall.iso",
-  :iso_src => "http://vault.centos.org/5.6/isos/x86_64/CentOS-5.6-x86_64-netinstall.iso",
+  :iso_src => "http://ftp.hosteurope.de/mirror/centos.org/5.6/isos/x86_64/CentOS-5.6-x86_64-netinstall.iso",
   :iso_md5 => "02cf3a5e32aaa5eed27af775ad292beb",
   :iso_download_timeout => 1000,
   :boot_wait => "10", :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",

data/templates/CentOS-5.6-x86_64-netboot/ks.cfg

@@ -1,7 +1,7 @@
 # Kickstart file automatically generated by anaconda.
 
 install
-url --url=http://vault.centos.org/5.6/os/x86_64
+url --url=http://mirror.bytemark.co.uk/centos/5.6/os/x86_64
 lang en_US.UTF-8
 langsupport --default=en_US.UTF-8 en_US.UTF-8
 keyboard us

data/templates/CentOS-5.6-x86_64-netboot/postinstall.sh

@@ -39,7 +39,7 @@ echo "Installing chef and puppet"
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 #Installing the virtualbox guest additions

data/templates/CentOS-5.7-i386-netboot/postinstall.sh

@@ -25,14 +25,14 @@ ln -s /usr/local/bin/ruby /usr/bin/ruby # Create a sym link for the same path
 ln -s /usr/local/bin/gem /usr/bin/gem # Create a sym link for the same path
 
 #Installing chef & Puppet
-/usr/bin/gem install chef --no-ri --no-rdoc
-/usr/bin/gem install puppet --no-ri --no-rdoc
+/opt/ruby/bin/gem install chef --no-ri --no-rdoc
+/opt/ruby/bin/gem install puppet --no-ri --no-rdoc
 
 #Installing vagrant keys
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 #Installing the virtualbox guest additions

data/templates/CentOS-5.7-x86_64-netboot/postinstall.sh

@@ -39,7 +39,7 @@ echo "Installing chef and puppet"
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 #Installing the virtualbox guest additions

data/templates/CentOS-6.0-i386-netboot/definition.rb

@@ -1,4 +1,4 @@
-Veewee::Session.declare({
+Veewee::Definition.declare({
   :cpu_count => '1', :memory_size=> '392',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat',
@@ -8,7 +8,7 @@ Veewee::Session.declare({
   :iso_download_timeout => 1000,
   :boot_wait => "15", :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",

data/templates/CentOS-6.0-i386-netboot/postinstall.sh

@@ -2,7 +2,7 @@
 
 date > /etc/vagrant_box_build_time
 
-yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y erase  gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 yum -y clean all
 
 gem install --no-ri --no-rdoc chef
@@ -11,7 +11,7 @@ gem install --no-ri --no-rdoc chef
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 # Installing the virtualbox guest additions

data/templates/CentOS-6.0-i386/definition.rb

@@ -1,4 +1,4 @@
-Veewee::Session.declare({
+Veewee::Definition.declare({
   :cpu_count => '1', :memory_size=> '384',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'RedHat',
@@ -9,7 +9,7 @@ Veewee::Session.declare({
     '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
   ],
   :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",

data/templates/CentOS-6.0-i386/postinstall.sh

@@ -19,7 +19,7 @@ gpgcheck=0
 EOM
 
 yum -y install puppet facter ruby-devel rubygems
-yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y erase  gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 yum -y clean all
 rm /etc/yum.repos.d/{puppetlabs,epel}.repo
 
@@ -29,7 +29,7 @@ gem install --no-ri --no-rdoc chef
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 # Installing the virtualbox guest additions

data/templates/CentOS-6.0-x86_64-minimal/definition.rb

@@ -1,8 +1,8 @@
 Veewee::Session.declare({
   :cpu_count => '1', :memory_size=> '384',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
-  :os_type_id => 'RedHat_64',
-  :iso_file => "CentOS-6.0-x86_64-minimal.iso", :iso_src => "http://vault.centos.org/6.0/isos/x86_64/CentOS-6.0-x86_64-minimal.iso", :iso_md5 => "b9fff4dad7aad0edaa564d7a251cb971", :iso_download_timeout => 1000,
+  :os_type_id => 'RedHat_64', :use_vbox_guest_add => true,
+  :iso_file => "CentOS-6.0-x86_64-minimal.iso", :iso_src => "http://be.mirror.eurid.eu/centos/6.0/isos/x86_64/CentOS-6.0-x86_64-minimal.iso", :iso_md5 => "b9fff4dad7aad0edaa564d7a251cb971", :iso_download_timeout => 1000,
   :iso_download_instructions => "We can not download the ISO , you need to download it yourself and put it in the iso directory\n"+
   "- URL: http://isoredirect.centos.org/centos/6/isos/x86_64/ ",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/CentOS-6.0-x86_64-minimal/postinstall.sh

@@ -2,7 +2,7 @@
 
 date > /etc/vagrant_box_build_time
 
-yum -y install gcc make gcc-c++ ruby zlib-devel openssl-devel readline-devel sqlite-devel perl
+yum -y install gcc make gcc-c++ ruby kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl
 
 cat > /etc/yum.repos.d/puppetlabs.repo << EOM
 [puppetlabs]
@@ -20,7 +20,7 @@ enabled=1
 gpgcheck=0
 EOM
 
-yum -y install dkms puppet facter ruby-devel rubygems
+yum -y install puppet facter ruby-devel rubygems
 yum -y clean all
 rm /etc/yum.repos.d/{puppetlabs,epel}.repo
 
@@ -30,27 +30,14 @@ gem install --no-ri --no-rdoc chef
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-echo "Installing authorized keys for vagrant user"
-curl --silent -L -o authorized_keys https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub
+curl -L -o authorized_keys http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub
 chown -R vagrant /home/vagrant/.ssh
 
 # Installing the virtualbox guest additions
-VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
-cd /tmp
-
-#force install the correct kernel headers for this version of centos
-echo "Retrieving and installing kernel-devel-2.6.32-71.el6.x86_64.rpm "
-curl --silent -L -o kernel-devel-2.6.32-71.el6.x86_64.rpm http://vault.centos.org/6.0/os/x86_64/Packages/kernel-devel-2.6.32-71.el6.x86_64.rpm
-sudo rpm -ivh --force kernel-devel-2.6.32-71.el6.x86_64.rpm
-
-echo "Retrieving and installing VBoxGuestAdditions"
-curl --silent -L -o VBoxGuestAdditions_$VBOX_VERSION.iso http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
-mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+mount /dev/sr0 /mnt
 sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
 
-rm VBoxGuestAdditions_$VBOX_VERSION.iso
-
 sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 
 dd if=/dev/zero of=/tmp/clean || rm /tmp/clean

data/templates/CentOS-6.0-x86_64-netboot/definition.rb

@@ -1,4 +1,4 @@
-Veewee::Session.declare({
+Veewee::Definition.declare({
   :cpu_count => '1', :memory_size=> '392',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat_64',
@@ -8,7 +8,7 @@ Veewee::Session.declare({
   :iso_download_timeout => 1000,
   :boot_wait => "15", :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",

data/templates/CentOS-6.0-x86_64-netboot/postinstall.sh

@@ -2,7 +2,7 @@
 
 date > /etc/vagrant_box_build_time
 
-yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y erase  gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 yum -y clean all
 
 gem install --no-ri --no-rdoc chef
@@ -11,7 +11,7 @@ gem install --no-ri --no-rdoc chef
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 # Installing the virtualbox guest additions

data/templates/CentOS-6.0-x86_64/definition.rb

@@ -1,4 +1,4 @@
-Veewee::Session.declare({
+Veewee::Definition.declare({
   :cpu_count => '1', :memory_size=> '384',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'RedHat_64',
@@ -9,7 +9,7 @@ Veewee::Session.declare({
     '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
   ],
   :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",

data/templates/CentOS-6.0-x86_64/postinstall.sh

@@ -19,7 +19,7 @@ gpgcheck=0
 EOM
 
 yum -y install puppet facter ruby-devel rubygems
-yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y erase  gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 yum -y clean all
 rm /etc/yum.repos.d/{puppetlabs,epel}.repo
 
@@ -29,7 +29,7 @@ gem install --no-ri --no-rdoc chef
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
 # Installing the virtualbox guest additions

data/templates/Debian-5.0.8-amd64-netboot/definition.rb

@@ -1,4 +1,4 @@
-Veewee::Session.declare({
+Veewee::Definition.declare({
   :cpu_count => '1',
   :memory_size=> '256',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',

data/templates/Debian-5.0.8-amd64-netboot/postinstall.sh

@@ -30,7 +30,7 @@ ln -sfv /usr/bin/gem1.8 /usr/bin/gem
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chmod 600 /home/vagrant/.ssh/authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 

data/templates/Debian-5.0.8-i386-netboot/definition.rb

@@ -1,4 +1,4 @@
-Veewee::Session.declare({
+Veewee::Definition.declare({
   :cpu_count => '1',
   :memory_size=> '256',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',

data/templates/Debian-5.0.8-i386-netboot/postinstall.sh

@@ -30,7 +30,7 @@ ln -sfv /usr/bin/gem1.8 /usr/bin/gem
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chmod 600 /home/vagrant/.ssh/authorized_keys
 chown -R vagrant /home/vagrant/.ssh