veewee 0.4.4 → 0.4.5.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzM2NTRjOTM1ODExZDQ4OWI1NjU1ZTk5ZWVhMzViNGIwNDA4ZGE0Mw==
+    MzYyNmUyZTIyNGM0NDUxZTFjZjhjYzUyZjg5NjRjNzY5ZmJlODlhNw==
   data.tar.gz: !binary |-
-    YzM0MDk2Y2IxYzFiNjU3NGRiNGU3NmM0YzcxZTA2M2FhNzU4YTc4Zg==
+    ZDYwZjVhODY3OGFiYWIyMTlhMWVhZmEwMzhiYjNkODg5ZjJhYjE2Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZGQ4M2I3ZDY3MWQyMWIyNmQ2MThkMTllMjk2YWI1ZDcyMjE5OTczZjJjY2Q5
-    MzAyN2Q1ZTBkN2Q1MDgzMzBhODVlNmZiNDdlYzQyYTkzMjcxMDRhMTJhODhh
-    MjU3MjJlZGYwZGE0OTFlOWRmZTMxZmFlOGI4N2Y3MDhlN2VhZTQ=
+    ODZkZmY2NmNmNThmZDMyYmUxN2UxNTY1MzFkMzJkZGU3ZDI0YjE1Y2U4MmE2
+    ZGQyMDZmMDBiMzM3ODNjMGI4ZmNhODgxZWQ2MTdlNTZiMjYwYTE1MTFlNDA0
+    MTUxMWU0NmI0NGZhN2IzNmJmNTY3Y2Q5MGRjODEzOGU2Nzg1ZDY=
   data.tar.gz: !binary |-
-    NzMxYjkxY2YyMjA2NzBiZmZjYjJmNzczYWRjMzJjYThiZjUyYTIyMWQyNWRh
-    NzZkMjQ4ZTdkNzE3YjZlMWQ3NTdmYzI4NGQzNWVmZjQzODc1NDViYmFmYWI0
-    N2JhNDVmYzE2NmU2OGI0OGJjMjczMjEzZmIzMzdkOTBlZDMzYmU=
+    M2U3MzQwMGU5ZTIzZGFjZWYwZmIwZmI2YjY2ZTFhMGJjYjBlYTI1M2Q4YWVj
+    MWI3NGE0MzQxNGQ5NDc0NjU2MTgzMDBmYjRkMzYzNjgzMjM2MGJlYTY1N2U4
+    NzNlNWVmNDYyYWQ1YTYxMGRhYmQ3YjE5MmI1NjkzMjZhMzFhYTk=

data/lib/veewee/provider/core/helper/web.rb

@@ -42,24 +42,25 @@ module Veewee
 
         module Web
           def wait_for_http_request(filename, urlname, options) # original blocking
-            s = server_for_http_request(filename, urlname, options)
-            s.start
+            server_for_http_request(filename, urlname, options) do |server|
+              server.start
+            end
           end
 
           def allow_for_http_request(filename, urlname, options) # start in new thread
-            s = server_for_http_request(filename, urlname, options.merge({:threaded => false}))
-            t = Thread.new { s.start }
-            t.abort_on_exception = true
+            server_for_http_request(filename, urlname, options.merge({:threaded => false})) do |server|
+              t = Thread.new { server.start }
+              t.abort_on_exception = true
+            end
           end
 
-          def server_for_http_request(filename, urlname, options)
+          def server_for_http_request(filename, urlname, options, &block)
             # Calculate the OS equivalent of /dev/null , on windows this is NUL:
             # http://www.ruby-forum.com/topic/115472
             fn = test(?e, '/dev/null') ? '/dev/null' : 'NUL:'
             webrick_logger = WEBrick::Log.new(fn, WEBrick::Log::INFO)
 
             timeout = options[:timeout] || 60
-            server  = nil
             Timeout.timeout(timeout) do
               server =
               ::WEBrick::HTTPServer.new(
@@ -74,6 +75,7 @@ module Veewee
                 ui.info "Stopping webserver"
                 exit
               }
+              yield server
             end
           rescue Timeout::Error
             server.shutdown unless server.nil?

data/lib/veewee/version.rb

@@ -4,5 +4,5 @@ end
 
 # Only set the version constant if it wasn't set before
 unless defined?(Veewee::VERSION)
-  ::Veewee::VERSION="0.4.4"
+  ::Veewee::VERSION="0.4.5.pre1"
 end

data/templates/kali-1.0.9a-amd64/base.sh

@@ -0,0 +1,26 @@
+# Update the box
+apt-get -y update
+apt-get -y upgrade
+apt-get -y install linux-headers-$(uname -r) build-essential
+apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev libyaml-dev libyaml-0-2
+apt-get -y install curl unzip vim
+
+# Set up sudo
+echo 'vagrant ALL=NOPASSWD:ALL' > /etc/sudoers.d/vagrant
+
+# Tweak sshd to prevent DNS resolution (speed up logins)
+echo 'UseDNS no' >> /etc/ssh/sshd_config
+
+# Remove 5s grub timeout to speed up booting
+cat <<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/kali-1.0.9a-amd64/chef.sh

@@ -0,0 +1,49 @@
+if [ -f .veewee_params ]
+then
+  . .veewee_params
+fi
+
+# Default to Gem install
+if [ -z "$CHEF_INSTALLMETHOD" ]; then
+  export CHEF_INSTALLMETHOD="gems"
+fi
+
+# Installing chef
+case $CHEF_INSTALLMETHOD in
+  "gems")
+    # Using gems
+    if [ -z "$CHEF_VERSION" ]; then
+      # Default to latest
+      gem install chef --no-ri --no-rdoc
+    else
+      gem install chef --no-ri --no-rdoc --version $CHEF_VERSION
+    fi
+    ;;
+
+  "omnibus")
+    # Using omnibus
+    if [ -z "$CHEF_VERSION" ]; then
+      # Default to latest
+      wget -O - http://opscode.com/chef/install.sh | sudo bash -s
+    else
+      wget -O - http://opscode.com/chef/install.sh | sudo bash -s -- -v $CHEF_VERSION
+    fi
+    ;;
+
+  "package")
+    # Using packages
+    apt-get install -y debconf-utils
+    echo "chef    chef/chef_server_url    string  $CHEF_SERVER_URL" | debconf-set-selections
+    if [ -z "$CHEF_VERSION" ]; then
+      # Default to latest
+      apt-get install -y chef
+    else
+      apt-get install -y chef=$CHEF_VERSION
+    fi
+    ;;
+
+  *)
+    echo "Unsupported method for installing chef"
+    exit -1
+    ;;
+esac

data/templates/kali-1.0.9a-amd64/cleanup.sh

@@ -0,0 +1,20 @@
+# Clean up
+apt-get -y remove linux-headers-$(uname -r)
+apt-get -y autoremove
+apt-get -y clean
+
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp/*
+
+# Make sure Udev doesn't block our network
+echo "cleaning up udev rules"
+rm /etc/udev/rules.d/70-persistent-net.rules
+mkdir /etc/udev/rules.d/70-persistent-net.rules
+rm -rf /dev/.udev/
+rm /lib/udev/rules.d/75-persistent-net-generator.rules
+
+echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
+echo "pre-up sleep 2" >> /etc/network/interfaces
+
+update-rc.d gdm3 disable

data/templates/kali-1.0.9a-amd64/definition.rb

@@ -0,0 +1,51 @@
+Veewee::Session.declare({
+  :cpu_count => '1',
+  :memory_size => '512',
+  :disk_size => '20480',
+  :disk_format => 'VDI',
+  :hostiocache => 'off',
+  :os_type_id => 'Debian_64',
+  :iso_file => "kali-linux-1.0.9a-amd64.iso",
+  :iso_src => "http://cdimage.kali.org/kali-1.0.9a/kali-linux-1.0.9a-amd64.iso",
+  :iso_md5 => "401e2b14921de5f808c7786b3b84dc57",
+  :iso_download_timeout => "2000",
+  :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 ',
+     'keyboard-configuration/xkb-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 bash '%f'",
+  :shutdown_cmd => "halt -h -p",
+  :postinstall_files => [
+    "base.sh",
+    "virtualbox.sh",
+    "vagrant.sh",
+    "chef.sh",
+    "puppet.sh",
+    "cleanup.sh",
+    "zerodisk.sh"
+  ],
+  :postinstall_timeout => "10000"
+})

data/templates/kali-1.0.9a-amd64/preseed.cfg

@@ -0,0 +1,73 @@
+d-i debian-installer/locale string en_US 
+d-i console-keymaps-at/keymap select us 
+d-i mirror/country string enter information manually 
+d-i mirror/suite string kali 
+d-i mirror/codename string kali 
+d-i mirror/http/hostname string archive.kali.org 
+d-i mirror/http/directory string /kali 
+d-i mirror/http/proxy string 
+d-i clock-setup/utc boolean true
+d-i clock-setup/ntp boolean true
+d-i time/zone string UTC 
+
+d-i apt-setup/services-select multiselect 
+
+d-i apt-setup/non-free boolean true 
+d-i apt-setup/contrib boolean true 
+
+d-i partman-auto/method string regular 
+d-i partman-lvm/device_remove_lvm boolean true 
+d-i partman-md/device_remove_md boolean true 
+d-i partman-lvm/confirm boolean true 
+d-i partman-auto/choose_recipe select atomic 
+d-i partman/confirm_write_new_label boolean true 
+d-i partman/choose_partition select finish 
+d-i partman/confirm boolean true 
+d-i partman/confirm_nooverwrite boolean true
+
+d-i apt-setup/local0/repository string http://archive.kali.org/kali-security kali/updates main 
+d-i apt-setup/local0/comment string Security updates 
+d-i apt-setup/local0/source boolean false 
+d-i apt-setup/use_mirror boolean true
+tasksel tasksel/first multiselect standard 
+d-i pkgsel/include string sudo openssh-server ntpupdate ntp acpid bzip2 rsync htop mysql-server
+d-i pkgsel/upgrade select full-upgrade
+
+d-i netcfg/get_hostname string unassigned-hostname 
+d-i netcfg/get_domain string unassigned-domain 
+d-i netcfg/hostname string system
+d-i passwd/make-user boolean true
+d-i passwd/root-password password toor 
+d-i passwd/root-password-again password toor 
+
+d-i passwd/user-fullname string Vagrant User
+d-i passwd/username string vagrant
+d-i passwd/user-password password vagrant
+d-i passwd/user-password-again password vagrant
+d-i passwd/user-default-groups string audio cdrom video adm sudo
+d-i user-setup/encrypt-home boolean false
+d-i user-setup/allow-password-weak boolean true
+
+popularity-contest popularity-contest/participate boolean false 
+d-i grub-installer/only_debian boolean true 
+d-i grub-installer/with_other_os boolean false 
+d-i finish-install/reboot_in_progress note
+
+kismet kismet/install-setuid boolean false
+kismet kismet/install-users string  
+
+mysql-server-5.5 mysql-server/root_password_again password  
+mysql-server-5.5 mysql-server/root_password password    
+mysql-server-5.5 mysql-server/error_setting_password error  
+mysql-server-5.5 mysql-server-5.5/postrm_remove_databases boolean false
+mysql-server-5.5 mysql-server-5.5/start_on_boot boolean true
+mysql-server-5.5 mysql-server-5.5/nis_warning note  
+mysql-server-5.5 mysql-server-5.5/really_downgrade boolean false
+mysql-server-5.5 mysql-server/password_mismatch error   
+mysql-server-5.5 mysql-server/no_upgrade_when_using_ndb error
+
+d-i preseed/late_command string in-target update-rc.d ssh enable
+
+d-i preseed/early_command string sed -i \
+  '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \
+  /usr/lib/pre-pkgsel.d/20install-hwpackages

data/templates/kali-1.0.9a-amd64/puppet.sh

@@ -0,0 +1,7 @@
+# Prepare puppetlabs repo
+wget http://apt.puppetlabs.com/puppetlabs-release-wheezy.deb
+dpkg -i puppetlabs-release-wheezy.deb
+apt-get update
+
+# Install puppet/facter
+apt-get install -y puppet facter

data/templates/kali-1.0.9a-amd64/vagrant.sh

@@ -0,0 +1,16 @@
+# Set up Vagrant.
+
+date > /etc/vagrant_box_build_time
+
+# Install vagrant keys
+mkdir -pm 700 /home/vagrant/.ssh
+curl -Lo /home/vagrant/.ssh/authorized_keys \
+  'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub'
+chmod 0600 /home/vagrant/.ssh/authorized_keys
+chown -R vagrant:vagrant /home/vagrant/.ssh
+
+# Customize the message of the day
+echo 'Welcome to your Vagrant-built virtual machine.' > /var/run/motd
+
+# Install NFS client
+apt-get -y install nfs-common

data/templates/kali-1.0.9a-amd64/virtualbox.sh

@@ -0,0 +1,37 @@
+if test -f .vbox_version ; then
+  # The netboot installs the VirtualBox support (old) so we have to remove it
+  if test -f /etc/init.d/virtualbox-ose-guest-utils ; then
+    /etc/init.d/virtualbox-ose-guest-utils stop
+  fi
+
+  rmmod vboxguest
+  aptitude -y purge virtualbox-ose-guest-x11 virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
+
+  # Install dkms for dynamic compiles
+
+  apt-get install -y dkms
+
+  # If libdbus is not installed, virtualbox will not autostart
+  apt-get -y install --no-install-recommends libdbus-1-3
+
+  # Install the VirtualBox guest additions
+  VBOX_VERSION=$(cat .vbox_version)
+  VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso
+  mount -o loop $VBOX_ISO /mnt
+  yes|sh /mnt/VBoxLinuxAdditions.run
+  umount /mnt
+
+  # Start the newly build driver
+  /etc/init.d/vboxadd start
+
+  # Make a temporary mount point
+  mkdir /tmp/veewee-validation
+
+  # Test mount the veewee-validation
+  mount -t vboxsf veewee-validation /tmp/veewee-validation
+
+  rm $VBOX_ISO
+
+  # Symlink vbox guest additions. Fix for https://github.com/mitchellh/vagrant/issues/3341
+  ln -s /opt/VBoxGuestAdditions-$VBOX_VERSION/lib/VBoxGuestAdditions /usr/lib/VBoxGuestAdditions
+fi

data/templates/kali-1.0.9a-amd64/zerodisk.sh

@@ -0,0 +1,3 @@
+# Zero out the free space to save space in the final image:
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: veewee
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5.pre1
 platform: ruby
 authors:
 - Patrick Debois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -1569,6 +1569,15 @@ files:
 - templates/gentoo-latest-i686/virtualbox.sh
 - templates/gentoo-latest-i686/wipe_sources.sh
 - templates/gentoo-latest-i686/zerodisk.sh
+- templates/kali-1.0.9a-amd64/base.sh
+- templates/kali-1.0.9a-amd64/chef.sh
+- templates/kali-1.0.9a-amd64/cleanup.sh
+- templates/kali-1.0.9a-amd64/definition.rb
+- templates/kali-1.0.9a-amd64/preseed.cfg
+- templates/kali-1.0.9a-amd64/puppet.sh
+- templates/kali-1.0.9a-amd64/vagrant.sh
+- templates/kali-1.0.9a-amd64/virtualbox.sh
+- templates/kali-1.0.9a-amd64/zerodisk.sh
 - templates/netbsd-613-amd64/README
 - templates/netbsd-613-amd64/base.sh
 - templates/netbsd-613-amd64/chef.sh