RubyGems - veewee - Versions diffs - 0.3.0.beta1 → 0.3.0.beta2 - Mend

veewee 0.3.0.beta1 → 0.3.0.beta2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (211) hide show

data/templates/CentOS-6.0-x86_64-netboot/ks.cfg CHANGED

@@ -1,13 +1,13 @@
 install
-url --url=http://be.mirror.eurid.eu/centos/6.0/os/x86_64/
+url --url=http://vault.centos.org/6.0/os/x86_64/
 lang en_US.UTF-8
 keyboard us
-network --bootproto dhcp
+network --bootproto=dhcp
 rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
-firewall --enabled --trust eth0 --ssh
-authconfig --enableshadow --enablemd5
+firewall --enabled --service=ssh
+authconfig --enableshadow --passalgo=sha512
 selinux --disabled
-timezone Europe/Brussels
+timezone UTC
 bootloader --location=mbr
 text
@@ -17,38 +17,26 @@ zerombr
 clearpart --all --initlabel
 autopart
-auth --useshadow --enablemd5
+auth  --useshadow  --enablemd5
 firstboot --disabled
 reboot
-repo --name=epel --baseurl=http://download.fedoraproject.org/pub/epel/6/x86_64/ --includepkgs='ruby-augeas,ruby-shadow'
-repo --name=puppetlabs --baseurl=http://yum.puppetlabs.com/el/6/products/x86_64 --includepkgs='puppet,facter'
-%packages
-@ core
-ruby
-ruby-devel
-rubygems
-kernel-devel
-gcc
-gcc-c++
+%packages --ignoremissing
+@core
 bzip2
-make
-zlib-devel
-openssl-devel
-readline-devel
-sqlite-devel
-puppet
-facter
+kernel-devel
+kernel-headers
 -ipw2100-firmware
 -ipw2200-firmware
 -ivtv-firmware
+%end
 %post
-/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.d/vagrant
-chmod 0440 /etc/sudoers.d/vagrant
+/usr/bin/yum -y install sudo
+/usr/sbin/groupadd veewee
+/usr/sbin/useradd veewee -g veewee -G wheel
+echo "veewee"|passwd --stdin veewee
+echo "veewee        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/veewee
+chmod 0440 /etc/sudoers.d/veewee
+%end

data/templates/CentOS-6.0-x86_64-netboot/puppet.sh ADDED

@@ -0,0 +1,12 @@
+# Install Puppet
+cat > /etc/yum.repos.d/puppetlabs.repo << EOM
+[puppetlabs]
+name=puppetlabs
+baseurl=http://yum.puppetlabs.com/el/6/products/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+yum -y install puppet facter

data/templates/CentOS-6.0-x86_64-netboot/ruby.sh ADDED

@@ -0,0 +1,3 @@
+# Install Ruby
+yum -y install ruby ruby-devel rubygems

data/templates/CentOS-6.0-x86_64-netboot/vagrant.sh ADDED

@@ -0,0 +1,18 @@
+# Vagrant specific
+date > /etc/vagrant_box_build_time
+# Add vagrant user
+/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.d/vagrant
+chmod 0440 /etc/sudoers.d/vagrant
+# Installing vagrant keys
+mkdir -pm 700 /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
+chmod 0600 /home/vagrant/.ssh/authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+# Customize the message of the day
+echo 'Welcome to your Vagrant-built virtual machine.' > /etc/motd

data/templates/CentOS-6.0-x86_64-netboot/virtualbox.sh ADDED

@@ -0,0 +1,8 @@
+# Installing the virtualbox guest additions
+VBOX_VERSION=$(cat /home/veewee/.vbox_version)
+cd /tmp
+mount -o loop /home/veewee/VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+sh /mnt/VBoxLinuxAdditions.run
+umount /mnt
+rm -rf /home/veewee/VBoxGuestAdditions_*.iso

data/templates/CentOS-6.0-x86_64-netboot/zerodisk.sh ADDED

@@ -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

data/templates/CentOS-6.0-x86_64/base.sh CHANGED

@@ -10,3 +10,13 @@ enabled=1
 gpgcheck=0
 EOM
+cat > /etc/yum.repos.d/centos-vault.repo << EOM
+[vault]
+name=vault
+baseurl=http://vault.centos.org/6.0/os/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl wget

data/templates/CentOS-6.0-x86_64/chef.sh CHANGED

@@ -1,2 +1,3 @@
 # Install Chef
 gem install --no-ri --no-rdoc chef

data/templates/CentOS-6.0-x86_64/cleanup.sh CHANGED

@@ -2,3 +2,4 @@ yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 yum -y clean all
 rm -rf /etc/yum.repos.d/{puppetlabs,epel}.repo
 rm -rf VBoxGuestAdditions_*.iso

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

@@ -1,6 +1,6 @@
-Veewee::Definition.declare({
+Veewee::Session.declare({
   :cpu_count => '1',
-  :memory_size=> '384',
+  :memory_size=> '480',
   :disk_size => '10140',
   :disk_format => 'VDI',
   :hostiocache => 'off',
@@ -9,8 +9,6 @@ Veewee::Definition.declare({
   :iso_src => "http://vault.centos.org/6.0/isos/x86_64/CentOS-6.0-x86_64-bin-DVD1.iso",
   :iso_md5 => "7c148e0a1b330186adef66ee3e2d433d",
   :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 => [
     '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
@@ -19,13 +17,24 @@ Veewee::Definition.declare({
   :kickstart_timeout => 10000,
   :kickstart_file => "ks.cfg",
   :ssh_login_timeout => "10000",
-  :ssh_user => "vagrant",
-  :ssh_password => "vagrant",
+  :ssh_user => "veewee",
+  :ssh_password => "veewee",
   :ssh_key => "",
   :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_files => [
+    "base.sh",
+    "ruby.sh",
+    "chef.sh",
+    "puppet.sh",
+    "vagrant.sh",
+    "virtualbox.sh",
+    #"kvm.sh",
+    #"vmfusion.sh",
+    "cleanup.sh",
+    "zerodisk.sh"
+  ],
   :postinstall_timeout => 10000
 })

data/templates/CentOS-6.0-x86_64/ks.cfg CHANGED

@@ -7,7 +7,7 @@ rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
 firewall --enabled --service=ssh
 authconfig --enableshadow --passalgo=sha512
 selinux --disabled
-timezone Europe/Brussels
+timezone UTC
 bootloader --location=mbr
 text
@@ -21,28 +21,22 @@ auth  --useshadow  --enablemd5
 firstboot --disabled
 reboot
-repo --name=updates --baseurl=http://mirror.centos.org/centos/6/updates/x86_64 --includepkgs='ruby' --excludepkgs='*'
 %packages --ignoremissing
 @core
-ruby
-kernel-devel-`uname -r`
-gcc
 bzip2
-make
-gcc-c++
-zlib-devel
-openssl-devel
-readline-devel
-sqlite-devel
+kernel-devel
+kernel-headers
 -ipw2100-firmware
 -ipw2200-firmware
 -ivtv-firmware
+%end
 %post
-/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.d/vagrant
-chmod 0440 /etc/sudoers.d/vagrant
+/usr/bin/yum -y install sudo
+/usr/sbin/groupadd veewee
+/usr/sbin/useradd veewee -g veewee -G wheel
+echo "veewee"|passwd --stdin veewee
+echo "veewee        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/veewee
+chmod 0440 /etc/sudoers.d/veewee
+%end

data/templates/CentOS-6.0-x86_64/puppet.sh CHANGED

@@ -9,3 +9,4 @@ gpgcheck=0
 EOM
 yum -y install puppet facter

data/templates/CentOS-6.0-x86_64/ruby.sh CHANGED

@@ -1,2 +1,3 @@
 # Install Ruby
-yum -y install ruby-devel rubygems
+yum -y install ruby ruby-devel rubygems

data/templates/CentOS-6.0-x86_64/vagrant.sh CHANGED

@@ -1,9 +1,18 @@
 # Vagrant specific
 date > /etc/vagrant_box_build_time
+# Add vagrant user
+/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.d/vagrant
+chmod 0440 /etc/sudoers.d/vagrant
 # 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
+mkdir -pm 700 /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
+chmod 0600 /home/vagrant/.ssh/authorized_keys
 chown -R vagrant /home/vagrant/.ssh
+# Customize the message of the day
+echo 'Welcome to your Vagrant-built virtual machine.' > /etc/motd

data/templates/CentOS-6.0-x86_64/virtualbox.sh CHANGED

@@ -1,8 +1,8 @@
 # Installing the virtualbox guest additions
-VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
+VBOX_VERSION=$(cat /home/veewee/.vbox_version)
 cd /tmp
-wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
-mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+mount -o loop /home/veewee/VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
 sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
-rm VBoxGuestAdditions_$VBOX_VERSION.iso
+rm -rf /home/veewee/VBoxGuestAdditions_*.iso

data/templates/CentOS-6.0-x86_64/zerodisk.sh ADDED

@@ -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

data/templates/CentOS-6.1-x86_64-minimal/base.sh CHANGED

@@ -10,4 +10,13 @@ enabled=1
 gpgcheck=0
 EOM
-yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl
+cat > /etc/yum.repos.d/centos-vault.repo << EOM
+[vault]
+name=vault
+baseurl=http://vault.centos.org/6.1/os/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl wget

data/templates/CentOS-6.1-x86_64-minimal/chef.sh CHANGED

@@ -1,2 +1,3 @@
 # Install Chef
 gem install --no-ri --no-rdoc chef

data/templates/CentOS-6.1-x86_64-minimal/cleanup.sh CHANGED

@@ -2,3 +2,4 @@ yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 yum -y clean all
 rm -rf /etc/yum.repos.d/{puppetlabs,epel}.repo
 rm -rf VBoxGuestAdditions_*.iso

data/templates/CentOS-6.1-x86_64-minimal/definition.rb CHANGED

@@ -1,6 +1,6 @@
 Veewee::Session.declare({
   :cpu_count => '1',
-  :memory_size=> '512',
+  :memory_size=> '480',
   :disk_size => '10140',
   :disk_format => 'VDI',
   :hostiocache => 'off',
@@ -33,7 +33,8 @@ Veewee::Session.declare({
     "virtualbox.sh",
     #"kvm.sh",
     #"vmfusion.sh",
-    "cleanup.sh"
+    "cleanup.sh",
+    "zerodisk.sh"
   ],
   :postinstall_timeout => 10000
 })

data/templates/CentOS-6.1-x86_64-minimal/ks.cfg CHANGED

@@ -1,13 +1,13 @@
 install
-url --url=http://be.mirror.eurid.eu/centos/6.1/os/x86_64/
+cdrom
 lang en_US.UTF-8
 keyboard us
-network --bootproto dhcp
+network --bootproto=dhcp
 rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
-firewall --enabled --trust eth0 --ssh
-authconfig --enableshadow --enablemd5
+firewall --enabled --service=ssh
+authconfig --enableshadow --passalgo=sha512
 selinux --disabled
-timezone Europe/Brussels
+timezone UTC
 bootloader --location=mbr
 text
@@ -17,31 +17,26 @@ zerombr
 clearpart --all --initlabel
 autopart
-auth --useshadow --enablemd5
+auth  --useshadow  --enablemd5
 firstboot --disabled
 reboot
-%packages
-@ core
-kernel-devel
-gcc
-gcc-c++
+%packages --ignoremissing
+@core
 bzip2
-make
-zlib-devel
-openssl-devel
-readline-devel
-sqlite-devel
-wget
+kernel-devel
+kernel-headers
 -ipw2100-firmware
 -ipw2200-firmware
 -ivtv-firmware
+%end
 %post
+/usr/bin/yum -y install sudo
 /usr/sbin/groupadd veewee
 /usr/sbin/useradd veewee -g veewee -G wheel
 echo "veewee"|passwd --stdin veewee
 echo "veewee        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/veewee
 chmod 0440 /etc/sudoers.d/veewee
+%end

data/templates/CentOS-6.1-x86_64-minimal/puppet.sh CHANGED

@@ -9,3 +9,4 @@ gpgcheck=0
 EOM
 yum -y install puppet facter

data/templates/CentOS-6.1-x86_64-minimal/ruby.sh CHANGED

@@ -1,2 +1,3 @@
 # Install Ruby
-yum -y install ruby-devel rubygems
+yum -y install ruby ruby-devel rubygems

data/templates/CentOS-6.1-x86_64-minimal/vagrant.sh CHANGED

@@ -9,8 +9,10 @@ echo "vagrant        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
 chmod 0440 /etc/sudoers.d/vagrant
 # Installing vagrant keys
-mkdir -p /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
+mkdir -pm 700 /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
+chmod 0600 /home/vagrant/.ssh/authorized_keys
 chown -R vagrant /home/vagrant/.ssh
+# Customize the message of the day
+echo 'Welcome to your Vagrant-built virtual machine.' > /etc/motd

data/templates/CentOS-6.1-x86_64-minimal/virtualbox.sh CHANGED

@@ -1,8 +1,8 @@
 # Installing the virtualbox guest additions
 VBOX_VERSION=$(cat /home/veewee/.vbox_version)
 cd /tmp
-#wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
 mount -o loop /home/veewee/VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
 sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
-rm -rf /home/veewee/VBoxGuestAdditions_$VBOX_VERSION.iso
+rm -rf /home/veewee/VBoxGuestAdditions_*.iso

data/templates/CentOS-6.1-x86_64-minimal/zerodisk.sh ADDED

@@ -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