RubyGems - veewee - Versions diffs - 0.3.7 → 0.3.9 - Mend

veewee 0.3.7 → 0.3.9

Files changed (966) hide show

data/templates/Debian-6.0.4-amd64-netboot/preseed.cfg CHANGED

@@ -96,7 +96,7 @@ d-i clock-setup/ntp boolean true
 # be given in traditional non-devfs format.
 # Note: A disk must be specified, unless the system has only one disk.
 # For example, to use the first SCSI/SATA hard disk:
-d-i partman-auto/disk string /dev/sda
+#d-i partman-auto/disk string /dev/sda
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
@@ -222,7 +222,7 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid sudo bzip2
+d-i pkgsel/include string openssh-server ntp acpid sudo bzip2 rsync
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

data/templates/Debian-6.0.4-i386-netboot/definition.rb CHANGED

@@ -5,8 +5,10 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
-  :iso_file => "debian-6.04-i386-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/cdimage/archive/6.0.4/i386/iso-cd/debian-6.0.4-i386-netinst.iso",
+  :iso_file => "debian-6.0.4-i386-netinst.iso",
+  :iso_src => "",
+  :iso_download_instructions => "- You need to download this manually as the ISO is no more directly downloadable\n"+
+  "Visit http://cdimage.debian.org/cdimage/archive/6.0.4/i386/ and download it via torrent or jigdo",
   :iso_md5 => "38bf1278cc5c98c5fa09dd0973ebc9f5",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-6.0.4-i386-netboot/preseed.cfg CHANGED

@@ -96,7 +96,7 @@ d-i clock-setup/ntp boolean true
 # be given in traditional non-devfs format.
 # Note: A disk must be specified, unless the system has only one disk.
 # For example, to use the first SCSI/SATA hard disk:
-d-i partman-auto/disk string /dev/sda
+#d-i partman-auto/disk string /dev/sda
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
@@ -222,7 +222,7 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2
+d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2 rsync
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

data/templates/Debian-6.0.5-amd64-netboot/definition.rb CHANGED

@@ -4,7 +4,9 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-6.0.5-amd64-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/6.0.5/amd64/iso-cd/debian-6.0.5-amd64-netinst.iso",
+  :iso_src => "",
+  :iso_download_instructions => "- You need to download this manually as the ISO is no more directly downloadable\n"+
+  "Visit http://cdimage.debian.org/cdimage/archive/6.0.5/amd64/ and download it via torrent or jigdo",
   :iso_md5 => "a213b1d6da1996c677706d843b6ee0f2",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-6.0.5-amd64-netboot/preseed.cfg CHANGED

@@ -96,7 +96,7 @@ d-i clock-setup/ntp boolean true
 # be given in traditional non-devfs format.
 # Note: A disk must be specified, unless the system has only one disk.
 # For example, to use the first SCSI/SATA hard disk:
-d-i partman-auto/disk string /dev/sda
+#d-i partman-auto/disk string /dev/sda
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
@@ -222,7 +222,7 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid sudo bzip2
+d-i pkgsel/include string openssh-server ntp acpid sudo bzip2 rsync
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

data/templates/Debian-6.0.5-i386-netboot/definition.rb CHANGED

@@ -6,7 +6,9 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-6.0.5-i386-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/6.0.5/i386/iso-cd/debian-6.0.5-i386-netinst.iso",
+  :iso_src => "",
+  :iso_download_instructions => "- You need to download this manually as the ISO is no more directly downloadable\n"+
+  "Visit http://cdimage.debian.org/cdimage/archive/6.0.5/i386/ and download it via torrent or jigdo",
   :iso_md5 => "bdf926d604258ce17dfba0b5ef067f17",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-6.0.5-i386-netboot/preseed.cfg CHANGED

@@ -66,7 +66,7 @@ d-i netcfg/wireless_wep string
 # If you select ftp, the mirror/country string does not need to be set.
 #d-i mirror/protocol string ftp
 d-i mirror/country string manual
-d-i mirror/http/hostname string http.us.debian.org
+d-i mirror/http/hostname string ftp.us.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
@@ -96,7 +96,7 @@ d-i clock-setup/ntp boolean true
 # be given in traditional non-devfs format.
 # Note: A disk must be specified, unless the system has only one disk.
 # For example, to use the first SCSI/SATA hard disk:
-d-i partman-auto/disk string /dev/sda
+#d-i partman-auto/disk string /dev/sda
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
@@ -222,7 +222,7 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2
+d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2 rsync
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

data/templates/Debian-6.0.6-amd64-netboot/base.sh CHANGED

@@ -6,8 +6,12 @@ apt-get -y install curl unzip
 apt-get clean
 # Set up sudo
-cp /etc/sudoers /etc/sudoers.orig
-sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers
+( cat <<'EOP'
+%vagrant ALL=NOPASSWD:ALL
+EOP
+) > /tmp/vagrant
+chmod 0440 /tmp/vagrant
+mv /tmp/vagrant /etc/sudoers.d/
 # Tweak sshd to prevent DNS resolution (speed up logins)
 echo 'UseDNS no' >> /etc/ssh/sshd_config

data/templates/Debian-6.0.6-amd64-netboot/chef.sh CHANGED

@@ -1,2 +1,2 @@
 # Install Chef
-gem install chef --no-ri --no-rdoc
+curl -L https://www.opscode.com/chef/install.sh | sudo bash

data/templates/Debian-6.0.6-amd64-netboot/definition.rb CHANGED

@@ -1,10 +1,12 @@
 Veewee::Definition.declare({
   :cpu_count => '1',
-  :memory_size=> '256',
+  :memory_size=> '512',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-6.0.6-amd64-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/6.0.6/amd64/iso-cd/debian-6.0.6-amd64-netinst.iso",
+  :iso_src => "",
+  :iso_download_instructions => "- You need to download this manually as the ISO is no more directly downloadable\n"+
+  "Visit http://cdimage.debian.org/cdimage/archive/6.0.6/amd64/ and download it via torrent or jigdo",
   :iso_md5 => "00585d63f8a560a73540bd718263319a",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
@@ -37,11 +39,11 @@ Veewee::Definition.declare({
   :postinstall_files => [
     "base.sh",
     "vagrant.sh",
+    "vmfusion.sh",
     "virtualbox.sh",
     "ruby.sh",
     "puppet.sh",
     "chef.sh",
-    "cleanup-virtualbox.sh",
     "cleanup.sh",
     "zerodisk.sh"
   ],

data/templates/Debian-6.0.6-amd64-netboot/preseed.cfg CHANGED

@@ -96,7 +96,7 @@ d-i clock-setup/ntp boolean true
 # be given in traditional non-devfs format.
 # Note: A disk must be specified, unless the system has only one disk.
 # For example, to use the first SCSI/SATA hard disk:
-d-i partman-auto/disk string /dev/sda
+#d-i partman-auto/disk string /dev/sda
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
@@ -222,7 +222,7 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid sudo bzip2
+d-i pkgsel/include string openssh-server ntp acpid sudo bzip2 rsync
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

data/templates/Debian-6.0.6-amd64-netboot/puppet.sh CHANGED

@@ -1,2 +1,2 @@
 # Install Puppet
-gem install puppet --no-ri --no-rdoc
+/opt/ruby/bin/gem install puppet --no-ri --no-rdoc

data/templates/Debian-6.0.6-amd64-netboot/ruby.sh CHANGED

@@ -1,10 +1,26 @@
-# Install Ruby from packages
-apt-get -y install ruby ruby-dev libruby1.8 ri
+# Install Ruby from source in /opt so that users of Vagrant
+# can install their own Rubies using packages or however.
-# Install Rubygems from source
-rg_ver=1.6.2
-curl -o /tmp/rubygems-${rg_ver}.zip \
-  "http://production.cf.rubygems.org/rubygems/rubygems-${rg_ver}.zip"
-(cd /tmp && unzip rubygems-${rg_ver}.zip && \
-  cd rubygems-${rg_ver} && ruby setup.rb --no-format-executable)
-rm -rf /tmp/rubygems-${rg_ver} /tmp/rubygems-${rg_ver}.zip
+apt-get -y install libyaml-0-2
+RUBY_VERSION=1.9.3-p392
+wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-$RUBY_VERSION.tar.gz
+tar xvzf ruby-$RUBY_VERSION.tar.gz
+cd ruby-$RUBY_VERSION
+./configure --prefix=/opt/ruby
+make
+make install
+cd ..
+rm -rf ruby-$RUBY_VERSION
+# Install RubyGems 1.8.25
+RUBYGEMS_VERSION=1.8.25
+wget http://production.cf.rubygems.org/rubygems/rubygems-$RUBYGEMS_VERSION.tgz
+tar xzf rubygems-$RUBYGEMS_VERSION.tgz
+cd rubygems-$RUBYGEMS_VERSION
+/opt/ruby/bin/ruby setup.rb
+cd ..
+rm -rf rubygems-$RUBYGEMS_VERSION
+# Add /opt/ruby/bin to the global path as the last resort so
+# Ruby, RubyGems, and Chef/Puppet are visible
+echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/vagrantruby.sh

data/templates/Debian-6.0.6-amd64-netboot/vagrant.sh CHANGED

@@ -21,5 +21,3 @@ echo 'Welcome to your Vagrant-built virtual machine.' > /var/run/motd
 # Install NFS client
 apt-get -y install nfs-common

data/templates/Debian-6.0.6-amd64-netboot/virtualbox.sh CHANGED

@@ -1,13 +1,18 @@
-if test -f .vbox_version ; then
-  # The netboot installs the VirtualBox support (old) so we have to remove it
-  /etc/init.d/virtualbox-ose-guest-utils stop
-  rmmod vboxguest
-  aptitude -y purge virtualbox-ose-guest-x11 virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
+# Without libdbus virtualbox would not start automatically after compile
+apt-get -y install --no-install-recommends libdbus-1-3
-  # Install the VirtualBox guest additions
-  VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
-  VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso
-  mount -o loop $VBOX_ISO /mnt
-  yes|sh /mnt/VBoxLinuxAdditions.run
-  umount /mnt
-fi
+# The netboot installs the VirtualBox support (old) so we have to remove it
+/etc/init.d/virtualbox-ose-guest-utils stop
+rmmod vboxguest
+aptitude -y purge virtualbox-ose-guest-x11 virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
+aptitude -y install dkms
+# Install the VirtualBox guest additions
+VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
+VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso
+mount -o loop $VBOX_ISO /mnt
+yes|sh /mnt/VBoxLinuxAdditions.run
+umount /mnt
+#Cleanup VirtualBox
+rm $VBOX_ISO

data/templates/Debian-6.0.6-amd64-netboot/vmfusion.sh ADDED

@@ -0,0 +1,7 @@
+cd /tmp
+mkdir -p /mnt/cdrom
+mount -o loop /home/vagrant/linux.iso /mnt/cdrom
+tar zxf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
+/tmp/vmware-tools-distrib/vmware-install.pl -d
+rm /home/vagrant/linux.iso
+umount /mnt/cdrom

data/templates/Debian-6.0.6-i386-netboot/base.sh CHANGED

@@ -3,7 +3,6 @@ apt-get -y update
 apt-get -y install linux-headers-$(uname -r) build-essential
 apt-get -y install zlib1g-dev libssl-dev libreadline5-dev
 apt-get -y install curl unzip
-apt-get clean
 # Set up sudo
 cp /etc/sudoers /etc/sudoers.orig

data/templates/Debian-6.0.6-i386-netboot/cleanup.sh CHANGED

@@ -1,6 +1,7 @@
 # Clean up
 apt-get -y remove linux-headers-$(uname -r) build-essential
 apt-get -y autoremove
+apt-get -y clean
 # Removing leftover leases and persistent rules
 echo "cleaning up dhcp leases"

data/templates/Debian-6.0.6-i386-netboot/definition.rb CHANGED

@@ -3,10 +3,19 @@
 Veewee::Definition.declare({
   :cpu_count => '1',
   :memory_size=> '256',
-  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'on',
   :os_type_id => 'Debian',
+  :virtualbox => { :vm_options => [
+                                   'hwvirtex' => 'off',
+                                   'hwvirtexexcl' => 'off',
+                                   'nestedpaging' => 'off',
+                                   'natdnshostresolver1' => 'on'
+                                  ]
+                          },
   :iso_file => "debian-6.0.6-i386-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-cd/debian-6.0.6-i386-netinst.iso",
+  :iso_src => "",
+  :iso_download_instructions => "- You need to download this manually as the ISO is no more directly downloadable\n"+
+  "Visit http://cdimage.debian.org/cdimage/archive/6.0.6/i386/ and download it via torrent or jigdo",
   :iso_md5 => "a5fdc1b74cd573d505a084baf7cc1462",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-6.0.6-i386-netboot/preseed.cfg CHANGED

@@ -66,7 +66,7 @@ d-i netcfg/wireless_wep string
 # If you select ftp, the mirror/country string does not need to be set.
 #d-i mirror/protocol string ftp
 d-i mirror/country string manual
-d-i mirror/http/hostname string http.us.debian.org
+d-i mirror/http/hostname string ftp.us.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
@@ -96,7 +96,7 @@ d-i clock-setup/ntp boolean true
 # be given in traditional non-devfs format.
 # Note: A disk must be specified, unless the system has only one disk.
 # For example, to use the first SCSI/SATA hard disk:
-d-i partman-auto/disk string /dev/sda
+#d-i partman-auto/disk string /dev/sda
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
@@ -222,7 +222,7 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2
+d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2 rsync
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

data/templates/Debian-6.0.6-i386-netboot/virtualbox.sh CHANGED

@@ -1,4 +1,7 @@
 if test -f .vbox_version ; then
+  # Without libdbus virtualbox would not start automatically after compile
+  apt-get -y install --no-install-recommends libdbus-1-3
   # The netboot installs the VirtualBox support (old) so we have to remove it
   /etc/init.d/virtualbox-ose-guest-utils stop
   rmmod vboxguest

data/templates/Debian-6.0.7-amd64-netboot/base.sh ADDED

@@ -0,0 +1,27 @@
+# Update the box
+apt-get -y update
+apt-get -y install linux-headers-$(uname -r) build-essential
+apt-get -y install zlib1g-dev libssl-dev libreadline5-dev
+apt-get -y install curl unzip
+apt-get clean
+# Set up sudo
+cp /etc/sudoers /etc/sudoers.orig
+sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers
+# Tweak sshd to prevent DNS resolution (speed up logins)
+echo 'UseDNS no' >> /etc/ssh/sshd_config
+# Remove 5s grub timeout to speed up booting
+echo <<EOF > /etc/default/grub
+# If you change this file, run 'update-grub' afterwards to update
+# /boot/grub/grub.cfg.
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=0
+GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
+GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX="debian-installer=en_US"
+EOF
+update-grub

data/templates/{Debian-7.0-b4-amd64-netboot → Debian-6.0.7-amd64-netboot}/chef.sh RENAMED

File without changes

data/templates/{Debian-6.0.6-amd64-netboot → Debian-6.0.7-amd64-netboot}/cleanup-virtualbox.sh RENAMED

File without changes

data/templates/{Debian-7.0-b4-amd64-netboot → Debian-6.0.7-amd64-netboot}/cleanup.sh RENAMED

File without changes

data/templates/Debian-6.0.7-amd64-netboot/definition.rb ADDED

@@ -0,0 +1,50 @@
+Veewee::Definition.declare({
+  :cpu_count => '1',
+  :memory_size=> '256',
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
+  :os_type_id => 'Debian_64',
+  :iso_file => "debian-6.0.7-amd64-netinst.iso",
+  :iso_src => "http://cdimage.debian.org/cdimage/archive/6.0.7/amd64/iso-cd/debian-6.0.7-amd64-netinst.iso",
+  :iso_md5 => "cc509122349a27bf1958e1ea0ce4065d",
+  :iso_download_timeout => "1000",
+  :boot_wait => "10", :boot_cmd_sequence => [
+    '<Esc>',
+    'install ',
+    'preseed/url=http://%IP%:%PORT%/preseed.cfg ',
+    'debian-installer=en_US ',
+    'auto ',
+    'locale=en_US ',
+    'kbd-chooser/method=us ',
+    'netcfg/get_hostname=%NAME% ',
+    'netcfg/get_domain=vagrantup.com ',
+    'fb=false ',
+    'debconf/frontend=noninteractive ',
+    'console-setup/ask_detect=false ',
+    'console-keymaps-at/keymap=us ',
+    '<Enter>'
+  ],
+  :kickstart_port => "7122",
+  :kickstart_timeout => "10000",
+  :kickstart_file => "preseed.cfg",
+  :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 => "halt -p",
+  :postinstall_files => [
+    "base.sh",
+    "vagrant.sh",
+    "virtualbox.sh",
+    #"vmfusion.sh",
+    "ruby.sh",
+    "puppet.sh",
+    "chef.sh",
+    "cleanup-virtualbox.sh",
+    "cleanup.sh",
+    "zerodisk.sh"
+  ],
+  :postinstall_timeout => "10000"
+})

data/templates/{Debian-7.0-b4-i386-netboot → Debian-6.0.7-amd64-netboot}/preseed.cfg RENAMED

@@ -96,7 +96,7 @@ d-i clock-setup/ntp boolean true
 # be given in traditional non-devfs format.
 # Note: A disk must be specified, unless the system has only one disk.
 # For example, to use the first SCSI/SATA hard disk:
-d-i partman-auto/disk string /dev/sda
+#d-i partman-auto/disk string /dev/sda
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
@@ -222,7 +222,7 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2
+d-i pkgsel/include string openssh-server ntp acpid sudo bzip2 rsync
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade