veewee 0.1.8 → 0.1.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    veewee (0.1.8)
+    veewee (0.1.9)
       highline (~> 1.6.1)
       net-ssh (~> 2.1.0)
       popen4 (~> 0.1.2)
@@ -21,7 +21,7 @@ GEM
       rake (>= 0.8.7)
     highline (1.6.1)
     i18n (0.5.0)
-    json (1.4.6)
+    json (1.5.1)
     mario (0.0.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
@@ -33,11 +33,11 @@ GEM
     progressbar (0.9.0)
     rake (0.8.7)
     thor (0.14.6)
-    vagrant (0.7.1)
+    vagrant (0.7.2)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
-      json (~> 1.4.6)
+      json (~> 1.5.1)
       mario (~> 0.0.6)
       net-scp (~> 1.0.4)
       net-ssh (~> 2.1.0)

data/lib/veewee/command.rb

@@ -52,7 +52,7 @@ class Command < Vagrant::Command::GroupBase
   
   desc "destroy BOXNAME", "Destroys the virtualmachine that was build for a basebox"
   def destroy(boxname)
-    puts Veewee::Session.destroy_vm(boxname)
+     Veewee::Session.destroy_vm(boxname)
   end
   
   desc "list", "Lists all defined baseboxes"

data/lib/veewee/session.rb

@@ -262,7 +262,12 @@ module Veewee
               versionfile=Tempfile.open("vbox.version")
               versionfile.puts "#{VirtualBox::Global.global.lib.virtualbox.version}"
               versionfile.rewind
-              Veewee::Ssh.transfer_file("localhost",versionfile.path,".vbox_version", ssh_options)
+              begin
+                Veewee::Ssh.transfer_file("localhost",versionfile.path,".vbox_version", ssh_options)
+              rescue RuntimeError
+                puts "error transfering file, possible not enough permissions to write?"
+                exit
+              end
               puts ""
               versionfile.close
               versionfile.delete
@@ -279,8 +284,12 @@ module Veewee
                  transaction(boxname,"#{counter}-#{postinstall_file}-#{checksums[counter]}",checksums) do
                    
                    Veewee::Ssh.when_ssh_login_works("localhost",ssh_options) do
- 
-                    Veewee::Ssh.transfer_file("localhost",filename,File.basename(filename),ssh_options)
+                    begin
+                      Veewee::Ssh.transfer_file("localhost",filename,File.basename(filename),ssh_options)
+                    rescue RuntimeError
+                      puts "error transfering file, possible not enough permissions to write?"
+                      exit
+                    end
                     command=@definition[:sudo_cmd]
                     command.gsub!(/%p/,"#{@definition[:ssh_password]}")
                     command.gsub!(/%u/,"#{@definition[:ssh_user]}")
@@ -340,7 +349,7 @@ module Veewee
     def self.destroy_vm(boxname)
       
       load_definition(boxname)
-            
+      @vboxcmd=determine_vboxcmd      
       #:destroy_medium => :delete,  will delete machine + all media attachments
       #vm.destroy(:destroy_medium => :delete)
       ##vm.destroy(:destroy_image => true)
@@ -357,12 +366,19 @@ module Veewee
       if (!vm.nil? && !(vm.powered_off?))
           puts "Shutting down vm #{boxname}"
           #We force it here, maybe vm.shutdown is cleaner
-          vm.stop
+          begin
+            vm.stop
+          rescue VirtualBox::Exceptions::InvalidVMStateException
+            puts "There was problem sending the stop command because the machine is in an Invalid state"
+            puts "Please verify leftovers from a previous build in your vm folder"
+            exit
+          end
+          sleep 3
       end     
-      sleep 3
+
       
       command="#{@vboxcmd} unregistervm  '#{boxname}' --delete"    
-
+      puts command
       puts "Deleting vm #{boxname}"
       
       #Exec and system stop the execution here
@@ -381,14 +397,16 @@ module Veewee
             command="#{@vboxcmd} closemedium disk '#{d.location}'"        
           end
           
-          command="#{@vboxcmd} closemedium disk '#{d.location}' --delete"
+          #command="#{@vboxcmd} closemedium disk '#{d.location}' --delete"
           puts "Deleting disk #{d.location}"
           puts "#{command}"
 
           Veewee::Shell.execute("#{command}") 
           
           if File.exists?(d.location) 
-            puts "We tried to delete the disk file '#{d.location} but failed"
+            puts "We tried to delete the disk file via virtualbox '#{d.location} but failed"
+            puts "Removing it manually"
+            FileUtils.rm(d.location)
             exit
           end 
           #v.3
@@ -396,9 +414,6 @@ module Veewee
           break
         end
       end     
-      
-      
-      
     end
     
     def self.create_vm(boxname,force=false)
@@ -477,6 +492,8 @@ module Veewee
         end
       end   
 
+      @vboxcmd=determine_vboxcmd
+      
       if !found
         puts "Creating new harddrive of size #{@definition[:disk_size].to_i} "
         
@@ -489,12 +506,13 @@ module Veewee
 	      ##VirtualBox::Global.global.max_vdi_size=1000000
         #newdisk.save
         
-        command="VBoxManage  list  systemproperties|grep '^Default machine'|cut -d ':' -f 2|sed -e 's/^[ ]*//'"
+        command="#{@vboxcmd}  list  systemproperties|grep '^Default machine'|cut -d ':' -f 2|sed -e 's/^[ ]*//'"
         results=IO.popen("#{command}")
         place=results.gets.chop
         results.close
          
         command ="#{@vboxcmd} createhd --filename '#{place}/#{boxname}/#{boxname}.#{@definition[:disk_format]}' --size '#{@definition[:disk_size].to_i}' --format #{@definition[:disk_format]} > /dev/null"
+        puts "#{command}"
         Veewee::Shell.execute("#{command}")
                    
       end
@@ -516,8 +534,10 @@ module Veewee
     
     def self.attach_disk(boxname)
       location=boxname+"."+@definition[:disk_format].downcase
-  
-      command="VBoxManage  list  systemproperties|grep '^Default machine'|cut -d ':' -f 2|sed -e 's/^[ ]*//'"
+    
+      @vboxcmd=determine_vboxcmd
+      
+      command="#{@vboxcmd}  list  systemproperties|grep '^Default machine'|cut -d ':' -f 2|sed -e 's/^[ ]*//'"
       results=IO.popen("#{command}")
       place=results.gets.chop
       results.close

data/lib/veewee/transaction.rb

@@ -19,23 +19,29 @@ module Veewee
   end
 
   def self.remove_snapshot_vmachine(vmname,snapname)
-    Veewee::Shell.execute("VBoxManage snapshot '#{vmname}' delete '#{snapname}'")
+    @vboxcmd=Veewee::Session.determine_vboxcmd
+    
+    Veewee::Shell.execute("#{@vboxcmd} snapshot '#{vmname}' delete '#{snapname}'")
   end
 
   def self.create_snapshot_vmachine(vmname,snapname)
-    Veewee::Shell.execute("VBoxManage snapshot '#{vmname}' take '#{snapname}'")
+    @vboxcmd=Veewee::Session.determine_vboxcmd
+    
+    Veewee::Shell.execute("#{@vboxcmd} snapshot '#{vmname}' take '#{snapname}'")
   end
 
   def self.load_snapshot_vmachine(vmname,snapname)
+    @vboxcmd=Veewee::Session.determine_vboxcmd
+    
     #if it running , shutdown first
     if (state_vmachine(vmname)=="running")
       stop_vmachine(vmname)
     end
 
-    Veewee::Shell.execute("VBoxManage snapshot '#{vmname}' restore '#{snapname}'")
+    Veewee::Shell.execute("#{@vboxcmd} snapshot '#{vmname}' restore '#{snapname}'")
     #sometimes it takes some time to shutdown
     sleep 2
-    Veewee::Shell.execute("VBoxManage startvm '#{vmname}'")
+    Veewee::Shell.execute("#{@vboxcmd} startvm '#{vmname}'")
   end
 
   def self.snapshot_exists(vmname,snapname)
@@ -58,10 +64,11 @@ module Veewee
 
   def self.rollback_snapshot(vmname,snapname)
     delete_flag=false
+    @vboxcmd=Veewee::Session.determine_vboxcmd
 
     savestate_recover=false
     if (state_vmachine(vmname)=="running")
-      Veewee::Shell.execute("VBoxManage controlvm '#{vmname}' savestate")
+      Veewee::Shell.execute("#{@vboxcmd} controlvm '#{vmname}' savestate")
       savestate_recover=true
      end
 
@@ -77,7 +84,7 @@ module Veewee
     
      sleep 2
 
-      Veewee::Shell.execute("VBoxManage startvm '#{vmname}'")
+      Veewee::Shell.execute("#{@vboxcmd} startvm '#{vmname}'")
 
       if (savestate_recover)
         #Recovering from savestate nukes the network! This trick seem to work
@@ -85,9 +92,9 @@ module Veewee
         #http://www.virtualbox.org/ticket/5666
         #http://www.virtualbox.org/ticket/5654
         #This is supposed to be fixed: http://www.virtualbox.org/changeset/25205 but alas
-        Veewee::Shell.execute("VBoxManage controlvm '#{vmname}' nic1 nat")
-        Veewee::Shell.execute("VBoxManage controlvm '#{vmname}' setlinkstate1 off")
-        Veewee::Shell.execute("VBoxManage controlvm '#{vmname}' setlinkstate1 on")
+        Veewee::Shell.execute("#{@vboxcmd} controlvm '#{vmname}' nic1 nat")
+        Veewee::Shell.execute("#{@vboxcmd} controlvm '#{vmname}' setlinkstate1 off")
+        Veewee::Shell.execute("#{@vboxcmd} controlvm '#{vmname}' setlinkstate1 on")
         sleep 2
 
         #hmmm, virtualbox => when recovering from a restore , it looses the nat settings!!! So we need to do this again!!
@@ -101,7 +108,9 @@ module Veewee
 
 
     def self.list_snapshots(vmname)
-      snapshotresult=Veewee::Shell.execute("VBoxManage showvminfo --machinereadable '#{vmname}' |grep ^SnapshotName| cut -d '=' -f 2").stdout
+      @vboxcmd=Veewee::Session.determine_vboxcmd
+      
+      snapshotresult=Veewee::Shell.execute("#{@vboxcmd} showvminfo --machinereadable '#{vmname}' |grep ^SnapshotName| cut -d '=' -f 2").stdout
       snapshotlist=snapshotresult.gsub(/\"/,'').split(/\n/)
       return snapshotlist
     end

data/lib/veewee/version.rb

@@ -1,3 +1,3 @@
 module Veewee
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/templates/Archlinux-experimental/autorun0

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "We are installing archlinux through the livecd of System Rescue"
+echo "Please wait while we do the grunt work ."
+
+echo "Occassinally this hangs because of network issues to the archlinux mirrors"

data/templates/Archlinux-experimental/definition.rb

@@ -0,0 +1,22 @@
+Veewee::Session.declare( {
+  :cpu_count => '1', :memory_size=> '256', 
+  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :os_type_id => 'Linux',
+  :iso_file => "systemrescuecd-x86-2.0.0.iso",
+  :iso_src => "http://downloads.sourceforge.net/project/systemrescuecd/sysresccd-x86/2.0.0/systemrescuecd-x86-2.0.0.iso?r=http%3A%2F%2Fwww.sysresccd.org%2FDownload&ts=1297107227&use_mirror=ignum",
+  :iso_md5 => "51012e0bb943cff6367e5cea3a61cdbe",
+  :iso_download_timeout => "1000",
+  :boot_wait => "10",:boot_cmd_sequence => [ 
+	 '<Tab> ',
+   'setkmap=us dodhcp=eth0 dhcphostname=%NAME% ar_source=http://%IP%:%PORT%/ autoruns=0 rootpass=vagrant',
+	 '<Enter>' 
+    ],
+  :kickstart_port => "7122", :kickstart_timeout => "10000",:kickstart_file => "autorun0",
+  :ssh_login_timeout => "10000",:ssh_user => "root", :ssh_password => "vagrant",:ssh_key => "",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
+  :sudo_cmd => "sh '%f'",
+  :shutdown_cmd => "shutdown -H",
+  :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"
+   }
+)
+#'setkmap=us dodhcp=eth0 dhcphostname=%NAME% ar_source=http://%IP%:%PORT%/ autoruns=0 rootpass=vagrant',

data/templates/Archlinux-experimental/postinstall.sh

@@ -0,0 +1,184 @@
+#!/bin/bash
+
+#https://wiki.archlinux.org/index.php/Install_from_Existing_Linux
+
+ARCH=i686
+mkdir /tmp/archlinux
+cd /tmp/archlinux
+
+alias wget='wget --trust-server-names'
+
+wget http://www.archlinux.org/packages/core/$ARCH/pacman/download/
+wget http://www.archlinux.org/packages/core/any/pacman-mirrorlist/download/
+
+wget http://www.archlinux.org/packages/core/$ARCH/libfetch/download/
+wget http://www.archlinux.org/packages/core/$ARCH/libarchive/download/
+wget http://www.archlinux.org/packages/core/$ARCH/bzip2/download/
+wget http://www.archlinux.org/packages/core/$ARCH/openssl/download/
+wget http://www.archlinux.org/packages/core/$ARCH/xz/download/
+wget http://www.archlinux.org/packages/core/$ARCH/expat/download/
+
+for f in *.tar.xz ; do unxz -v $f ; done
+for f in *.tar ; do tar xvf $f ; done
+for f in *.tar.gz ; do tar xzvf $f ; done
+
+
+export PATH=/tmp/archlinux/usr/bin:$PATH
+export LD_LIBRARY_PATH=/tmp/archlinux/usr/lib:/tmp/archlinux/lib:$LD_LIBRARY_PATH
+alias pacman="pacman --config /tmp/archlinux/etc/pacman.conf"
+
+cd /
+for f in /tmp/archlinux/pacman-*pkg.tar.gz ; do
+  tar xzf $f
+done
+
+#/etc/pacman.d/mirrorlist
+#enable a mirror
+
+#Partition the disk
+#This assumes a predefined layout - customize to your own liking
+
+sfdisk --force /dev/sda <<EOF
+# partition table of /dev/sda
+unit: sectors
+
+/dev/sda1 : start=     2048, size= 18874368, Id=83
+/dev/sda2 : start= 18876416, size=  2095104, Id=82
+/dev/sda3 : start=        0, size=        0, Id= 0
+/dev/sda4 : start=        0, size=        0, Id= 0
+EOF
+
+sleep 2
+
+#Format the first disk
+mkfs.ext3 /dev/sda1
+
+#Format the swap and use it
+mkswap /dev/sda2
+swapon /dev/sda2
+
+mkdir /newarch 
+mount /dev/sda1 /newarch
+
+mkdir -p /newarch/var/lib/pacman 
+
+#setting pacman - mirror - Belgium
+#Customize to your own liking
+sed -i 's/^#\(.*kangaroot.*\)/\1/' /etc/pacman.d/mirrorlist
+
+# https://wiki.archlinux.org/index.php/Mirrors#List_by_speed
+# pacman -S reflector
+# export LC_ALL=C
+# reflector -c Belgium -l 8 -r -o /etc/pacman.d/mirrorlist
+
+pacman -Sy -r /newarch
+
+#pacman: error while loading shared libraries: libbz2.so.1.0: cannot open shared object file: No such file or directory
+#require bzip2 
+pacman --noconfirm --cachedir /newarch/var/cache/pacman/pkg -S base -r /newarch 
+
+#Create the devices
+cd /newarch/dev 
+rm -f console ; mknod -m 600 console c 5 1 
+rm -f null ; mknod -m 666 null c 1 3 
+rm -f zero ; mknod -m 666 zero c 1 5
+
+#Copy the dns information (cp is aliased so we use the binary)
+/bin/cp -f /etc/resolv.conf /newarch/etc/ 
+
+#Mount the process architecture
+mount -t proc proc /newarch/proc
+mount -t sysfs sys /newarch/sys
+mount -o bind /dev /newarch/dev
+
+chroot /newarch pacman --noconfirm -S kernel26 
+
+#set the mirror list within the machine
+chroot /newarch sed -i 's/^#\(.*kangaroot.*\)/\1/' /etc/pacman.d/mirrorlist
+#/etc/fstab
+#We need a partition!
+
+echo "echo '/dev/sda1              /         ext4      defaults,noatime        0	0' >> /etc/fstab"|chroot /newarch sh -
+echo "echo '/dev/sda2              swap          swap      defaults                0      0'>> /etc/fstab"|chroot /newarch sh -
+
+#/etc/rc.conf
+
+#hostname
+
+chroot /newarch sed -i 's/^HOSTNAME=\(.*\)/HOSTNAME=vagrant-arch/' /etc/rc.conf
+#gateway
+
+#/etc/hosts
+#/etc/mkinitcpio.conf
+#/etc/local.gen
+
+
+#grub
+echo "grep -v rootfs /proc/mounts > /etc/mtab" |chroot /newarch sh -
+chroot /newarch grub-install /dev/sda
+echo "cp -a /usr/lib/grub/i386-pc/* /boot/grub" | chroot /newarch sh -
+
+#/boot/grub/menu.lst
+
+echo "sed -i 's:^kernel\(.*\)$:kernel /boot/vmlinuz26 root=/dev/sda1 ro:' /boot/grub/menu.lst" | chroot /newarch sh -
+echo "sed -i 's:^initrd\(.*\)$:initrd /boot/kernel26.img:' /boot/grub/menu.lst" | chroot /newarch sh -
+
+#Configure ssh
+chroot /newarch pacman --noconfirm -S openssh
+
+#Still errors
+echo "sed -i 's:^DAEMONS\(.*\))$:DAEMONS\1 sshd):' /etc/rc.conf" | chroot /newarch sh -
+echo "echo 'sshd:ALL' > /etc/hosts.allow" | chroot /newarch sh -
+echo "echo 'ALL:ALL' > /etc/hosts.deny" | chroot /newarch sh -
+
+#Configure Sudo
+chroot /newarch pacman --noconfirm -S sudo
+echo "echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" | chroot /newarch sh -
+
+#create vagrant user  / password vagrant
+chroot /newarch useradd -m -r vagrant -p '$1$MPmczGP9$1SeNO4bw5YgiEJuo/ZkWq1'
+
+#get some ruby running
+chroot /newarch pacman --noconfirm -S git curl gcc make
+echo "bash < <( curl -L http://bit.ly/rvm-install-system-wide )"| chroot /newarch /bin/bash -
+echo "/usr/local/bin/rvm install ruby-1.8.7 "| chroot /newarch sh -
+echo "/usr/local/bin/rvm use ruby-1.8.7 --default "| chroot /newarch sh -
+
+
+#Installing chef & Puppet
+echo ". /usr/local/lib/rvm ; gem install chef --no-ri --no-rdoc"| chroot /newarch sh -
+echo ". /usr/local/lib/rvm ; gem install puppet --no-ri --no-rdoc"| chroot /newarch sh -
+
+#Installing vagrant keys
+echo "creating vagrant ssh keys"
+chroot /newarch mkdir /home/vagrant/.ssh
+chroot /newarch chmod 700 /home/vagrant/.ssh
+chroot /newarch cd /home/vagrant/.ssh
+chroot /newarch wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
+chroot /newarch chmod 600 /home/vagrant/.ssh/authorized_keys
+chroot /newarch chown -R vagrant /home/vagrant/.ssh
+
+echo "adding rvm to global bash rc"
+echo "echo '. /usr/local/lib/rvm' >> /etc/bash/bash.rc" | chroot /newarch sh -
+
+#https://wiki.archlinux.org/index.php/VirtualBox
+#kernel pacman -S kernel26-headers
+chroot /newarch pacman --noconfirm -S kernel26-headers
+#/bin/cp -f /root/.vbox_version /newarch/root/.vbox_version
+#VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
+##INstalling the virtualbox guest additions
+#cd /tmp
+#wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso   
+#mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+#sh /mnt/VBoxLinuxAdditions.run
+#chroot /newarch umount /mnt
+#rm VBoxGuestAdditions_$VBOX_VERSION.iso
+
+echo "sed -i 's:^DAEMONS\(.*\))$:DAEMONS\1 rc.vboxadd):' /etc/rc.conf" | chroot /newarch sh -
+
+
+cd /
+umount /newarch/{proc,sys,dev}
+umount /newarch
+
+reboot

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

@@ -6,7 +6,7 @@ Veewee::Session.declare( {
   :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_host_port => "2222", :ssh_guest_port => "22",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",
   :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => 10000

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

@@ -18,8 +18,9 @@ echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
 rm -rf ./ruby-enterprise-1.8.7-2010.02/
 rm ruby-enterprise-1.8.7-2010.02.tar.gz
 
-#Installing chef
+#Installing chef & Puppet
 /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

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

@@ -9,7 +9,7 @@ Veewee::Session.declare( {
 :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_host_port => "2222", :ssh_guest_port => "22",
+:ssh_host_port => "7222", :ssh_guest_port => "22",
 :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
 :shutdown_cmd => "/sbin/halt -h -p",
 :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => 10000

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

@@ -18,8 +18,9 @@ echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
 rm -rf ./ruby-enterprise-1.8.7-2010.02/
 rm ruby-enterprise-1.8.7-2010.02.tar.gz
 
-#Installing chef
+#Installing chef & Puppet
 /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

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

@@ -8,7 +8,7 @@
           ],
         :kickstart_port => "7122", :kickstart_timeout => 10000,:kickstart_file => "ks.cfg",
         :ssh_login_timeout => "100",:ssh_user => "vagrant", :ssh_password => "vagrant",:ssh_key => "",
-        :ssh_host_port => "2222", :ssh_guest_port => "22",
+        :ssh_host_port => "7222", :ssh_guest_port => "22",
         :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
         :shutdown_cmd => "/sbin/halt -h -p",
         :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => 10000

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

@@ -18,8 +18,9 @@ echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
 rm -rf ./ruby-enterprise-1.8.7-2010.02/
 rm ruby-enterprise-1.8.7-2010.02.tar.gz
 
-#Installing chef
+#Installing chef & Puppet
 /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

data/templates/Sysrescuecd-2.0.0-experimental/autorun0

@@ -1,59 +1,3 @@
 #!/bin/bash
 
-#https://wiki.archlinux.org/index.php/Install_from_Existing_Linux
-
-ARCH=i686
-mkdir /tmp/archlinux
-cd /tmp/archlinux
-
-alias wget='wget --trust-server-names'
-
-wget http://www.archlinux.org/packages/core/$ARCH/pacman/download/
-wget http://www.archlinux.org/packages/core/any/pacman-mirrorlist/download/
-
-wget http://www.archlinux.org/packages/core/$ARCH/libfetch/download/
-wget http://www.archlinux.org/packages/core/$ARCH/libarchive/download/
-wget http://www.archlinux.org/packages/core/$ARCH/openssl/download/
-wget http://www.archlinux.org/packages/core/$ARCH/xz/download/
-wget http://www.archlinux.org/packages/core/$ARCH/expat/download/
-
-for f in *.tar.gz ; do tar xzvf $f ; done
-
-export PATH=/tmp/archlinux/usr/bin:$PATH
-export LD_LIBRARY_PATH=/tmp/archlinux/usr/lib:$LD_LIBRARY_PATH
-alias pacman="pacman --config /tmp/archlinux/etc/pacman.conf"
-
-cd /
-for f in /tmp/archlinux/pacman-*pkg.tar.gz ; do
-  tar xzf $f
-done
-
-#needs fdisk first
-mkfs.ext3 /dev/sda1
-mkfs.ext3 -j -O dir_index /dev/sda1 
-
-mkreiserfs /dev/sdxx 
-
-mkswap /dev/sda2
-swapon /dev/sda2
-
-mkdir /newarch 
-mount /dev/sda1 /newarch
-
-mkdir -p /newarch/var/lib/pacman 
-pacman -Sy -r /newarch
-
-pacman --cachedir /newarch/var/cache/pacman/pkg -S base -r /newarch
-
-cd /newarch/dev 
-rm console ; mknod -m 600 console c 5 1 
-rm null ; mknod -m 666 null c 1 3 
-rm zero ; mknod -m 666 zero c 1 5
-
-cp /etc/resolv.conf /newarch/etc/ 
-
-mount -t proc proc /newarch/proc
-mount -t sysfs sys /newarch/sys
-mount -o bind /dev /newarch/dev
-
-chroot /newroot pacman -S kernel26
+echo "we made it to autorun"

data/templates/Sysrescuecd-2.0.0-experimental/definition.rb

@@ -13,8 +13,8 @@ Veewee::Session.declare( {
     ],
   :kickstart_port => "7122", :kickstart_timeout => "10000",:kickstart_file => "autorun0",
   :ssh_login_timeout => "10000",:ssh_user => "root", :ssh_password => "vagrant",:ssh_key => "",
-  :ssh_host_port => "2222", :ssh_guest_port => "22",
-  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
+  :sudo_cmd => "sh '%f'",
   :shutdown_cmd => "shutdown -H",
   :postinstall_files => [ ],:postinstall_timeout => "10000"
    }

data/templates/ubuntu-10.04.1-server-amd64/definition.rb

@@ -17,7 +17,7 @@ Veewee::Session.declare( {
     ],
   :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 => "2222", :ssh_guest_port => "22",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "shutdown -H",
   :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"

data/templates/ubuntu-10.04.1-server-amd64/postinstall.sh

@@ -18,8 +18,9 @@ echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
 rm -rf ./ruby-enterprise-1.8.7-2010.02/
 rm ruby-enterprise-1.8.7-2010.02.tar.gz
 
-#Installing chef
+#Installing chef & Puppet
 /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

data/templates/ubuntu-10.04.1-server-i386/definition.rb

@@ -17,7 +17,7 @@ Veewee::Session.declare( {
     ],
   :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 => "2222", :ssh_guest_port => "22",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "shutdown -H",
   :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"

data/templates/ubuntu-10.04.1-server-i386/postinstall.sh

@@ -20,8 +20,9 @@ echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
 rm -rf ./ruby-enterprise-1.8.7-2010.02/
 rm ruby-enterprise-1.8.7-2010.02.tar.gz
 
-#Installing chef
+#Installing chef & Puppet
 /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

data/templates/ubuntu-10.10-server-amd64-netboot/definition.rb

@@ -17,7 +17,7 @@ Veewee::Session.declare( {
     ],
   :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 => "2222", :ssh_guest_port => "22",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "shutdown -P now",
   :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"

data/templates/ubuntu-10.10-server-amd64-netboot/postinstall.sh

@@ -20,8 +20,9 @@ echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
 rm -rf ./ruby-enterprise-1.8.7-2010.02/
 rm ruby-enterprise-1.8.7-2010.02.tar.gz
 
-#Installing chef
+#Installing chef & Puppet
 /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

data/templates/ubuntu-10.10-server-amd64-netboot/preseed.cfg

@@ -78,10 +78,12 @@ d-i pkgsel/update-policy select none
 #Use mirror
 #d-i apt-setup/use_mirror boolean true
 #d-i     mirror/country          string manual
-#choose-mirror-bin mirror/protocol	string http
-#choose-mirror-bin mirror/http/hostname	string 192.168.4.150
-#choose-mirror-bin mirror/http/directory	string /ubuntu
-#choose-mirror-bin mirror/suite	select maverick
+d-i     mirror/country          string US
+
+d-i mirror/protocol	string http
+d-i mirror/country string manual
+d-i mirror/http/hostname	string us.archive.ubuntu.com
+d-i mirror/http/directory	string /ubuntu
+d-i mirror/suite	select maverick
+d-i mirror/http/proxy string
 #d-i debian-installer/allow_unauthenticated	string true
-
-choose-mirror-bin mirror/http/proxy string 

data/templates/ubuntu-10.10-server-amd64/definition.rb

@@ -17,7 +17,7 @@ Veewee::Session.declare( {
     ],
   :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 => "2222", :ssh_guest_port => "22",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "shutdown -P now",
   :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"

data/templates/ubuntu-10.10-server-amd64/postinstall.sh

@@ -20,8 +20,9 @@ echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
 rm -rf ./ruby-enterprise-1.8.7-2010.02/
 rm ruby-enterprise-1.8.7-2010.02.tar.gz
 
-#Installing chef
-/opt/ruby/bin/gem install chef --no-ri --no-rdoc 
+#Installing chef & Puppet
+/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

data/templates/ubuntu-10.10-server-i386-netboot/definition.rb

@@ -17,7 +17,7 @@ Veewee::Session.declare( {
     ],
   :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 => "2222", :ssh_guest_port => "22",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "shutdown -P now",
   :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"

data/templates/ubuntu-10.10-server-i386-netboot/postinstall.sh

@@ -20,8 +20,9 @@ echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
 rm -rf ./ruby-enterprise-1.8.7-2010.02/
 rm ruby-enterprise-1.8.7-2010.02.tar.gz
 
-#Installing chef
+#Installing chef & Puppet
 /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

data/templates/ubuntu-10.10-server-i386-netboot/preseed.cfg

@@ -78,10 +78,12 @@ d-i pkgsel/update-policy select none
 #Use mirror
 #d-i apt-setup/use_mirror boolean true
 #d-i     mirror/country          string manual
-#choose-mirror-bin mirror/protocol	string http
-#choose-mirror-bin mirror/http/hostname	string 192.168.4.150
-#choose-mirror-bin mirror/http/directory	string /ubuntu
-#choose-mirror-bin mirror/suite	select maverick
+d-i     mirror/country          string US
+
+d-i mirror/protocol	string http
+d-i mirror/country string manual
+d-i mirror/http/hostname	string us.archive.ubuntu.com
+d-i mirror/http/directory	string /ubuntu
+d-i mirror/suite	select maverick
+d-i mirror/http/proxy string
 #d-i debian-installer/allow_unauthenticated	string true
-
-choose-mirror-bin mirror/http/proxy string 

data/templates/ubuntu-10.10-server-i386/definition.rb

@@ -17,7 +17,7 @@ Veewee::Session.declare( {
     ],
   :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 => "2222", :ssh_guest_port => "22",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "shutdown -P now",
   :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"

data/templates/ubuntu-10.10-server-i386/postinstall.sh

@@ -20,8 +20,9 @@ echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
 rm -rf ./ruby-enterprise-1.8.7-2010.02/
 rm ruby-enterprise-1.8.7-2010.02.tar.gz
 
-#Installing chef
+#Installing chef & Puppet
 /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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: veewee
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Patrick Debois
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +01:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,6 +159,9 @@ files:
 - lib/veewee/transaction.rb
 - lib/veewee/version.rb
 - lib/veewee/web.rb
+- templates/Archlinux-experimental/autorun0
+- templates/Archlinux-experimental/definition.rb
+- templates/Archlinux-experimental/postinstall.sh
 - templates/CentOS-4.8-i386/definition.rb
 - templates/CentOS-4.8-i386/ks.cfg
 - templates/CentOS-4.8-i386/postinstall.sh