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

veewee 0.3.0.beta1 → 0.3.0.beta2

Files changed (211) hide show

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

@@ -10,4 +10,5 @@ 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
+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-netboot/chef.sh CHANGED

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

data/templates/CentOS-6.1-x86_64-netboot/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-netboot/definition.rb CHANGED

@@ -1,18 +1,18 @@
-Veewee::Definition.declare({
+Veewee::Session.declare({
   :cpu_count => '1',
   :memory_size=> '480',
   :disk_size => '10140',
   :disk_format => 'VDI',
   :hostiocache => 'off',
-  :ioapic => 'on',
-  :pae => 'on',
   :os_type_id => 'RedHat_64',
   :iso_file => "CentOS-6.1-x86_64-netinstall.iso",
   :iso_src => "http://vault.centos.org/6.1/isos/x86_64/CentOS-6.1-x86_64-netinstall.iso",
-  :iso_md5 => "d13da95c29e585ee15cf403b89468243",
+  :iso_md5 => "b0366858089526fb025f0da4abf6d732",
   :iso_download_timeout => 1000,
   :boot_wait => "15",
-  :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
+  :boot_cmd_sequence => [
+    '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
+  ],
   :kickstart_port => "7122",
   :kickstart_timeout => 10000,
   :kickstart_file => "ks.cfg",
@@ -33,7 +33,8 @@ Veewee::Definition.declare({
     "virtualbox.sh",
     #"kvm.sh",
     #"vmfusion.sh",
-    "cleanup.sh"
+    "cleanup.sh",
+    "zerodisk.sh"
   ],
   :postinstall_timeout => 10000
 })

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

@@ -1,13 +1,13 @@
 install
-url --url=http://be.mirror.eurid.eu/centos/6.1/os/x86_64/
+url --url=http://vault.centos.org/6.1/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,30 +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
+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-netboot/puppet.sh CHANGED

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

data/templates/CentOS-6.1-x86_64-netboot/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-netboot/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-netboot/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 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.1-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.2-i386-minimal/base.sh CHANGED

@@ -10,5 +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.2/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.2-i386-minimal/definition.rb CHANGED

@@ -6,7 +6,7 @@ Veewee::Session.declare({
   :hostiocache => 'off',
   :os_type_id => 'RedHat_64',
   :iso_file => "CentOS-6.2-i386-minimal.iso",
-  :iso_src => "http://ftp.yz.yamagata-u.ac.jp/pub/linux/centos/6.2/isos/i386/CentOS-6.2-i386-minimal.iso",
+  :iso_src => "http://vault.centos.org/6.2/isos/i386/CentOS-6.2-i386-minimal.iso",
   :iso_md5 => "cc4fbd16bd305f5bf6731b4b10f8fd18",
   :iso_download_timeout => 1000,
   :boot_wait => "10",
@@ -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.2-i386-minimal/ks.cfg CHANGED

@@ -24,10 +24,12 @@ reboot
 %packages --ignoremissing
 @core
 bzip2
+kernel-devel
+kernel-headers
 -ipw2100-firmware
 -ipw2200-firmware
 -ivtv-firmware
+%end
 %post
 /usr/bin/yum -y install sudo
@@ -36,4 +38,5 @@ bzip2
 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.2-i386-minimal/vagrant.sh CHANGED

@@ -9,9 +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.2-i386-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

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

@@ -10,5 +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.2/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.2-x86_64-minimal/definition.rb CHANGED

@@ -6,7 +6,7 @@ Veewee::Session.declare({
   :hostiocache => 'off',
   :os_type_id => 'RedHat_64',
   :iso_file => "CentOS-6.2-x86_64-minimal.iso",
-  :iso_src => "http://centos.weepeetelecom.be/6.2/isos/x86_64/CentOS-6.2-x86_64-minimal.iso",
+  :iso_src => "http://vault.centos.org/6.2/isos/x86_64/CentOS-6.2-x86_64-minimal.iso",
   :iso_md5 => "20dac370a6e08ded2701e4104855bc6e",
   :iso_download_timeout => 1000,
   :boot_wait => "10",
@@ -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.2-x86_64-minimal/ks.cfg CHANGED

@@ -24,10 +24,12 @@ reboot
 %packages --ignoremissing
 @core
 bzip2
+kernel-devel
+kernel-headers
 -ipw2100-firmware
 -ipw2200-firmware
 -ivtv-firmware
+%end
 %post
 /usr/bin/yum -y install sudo
@@ -36,4 +38,5 @@ bzip2
 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.2-x86_64-minimal/vagrant.sh CHANGED

@@ -9,9 +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.2-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

data/templates/CentOS-6.2-x86_64-netboot/base.sh CHANGED

@@ -10,4 +10,5 @@ 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
+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.2-x86_64-netboot/chef.sh CHANGED

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

data/templates/CentOS-6.2-x86_64-netboot/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.2-x86_64-netboot/definition.rb CHANGED

@@ -1,18 +1,18 @@
-Veewee::Definition.declare({
+Veewee::Session.declare({
   :cpu_count => '1',
   :memory_size=> '480',
   :disk_size => '10140',
   :disk_format => 'VDI',
   :hostiocache => 'off',
-  :ioapic => 'on',
-  :pae => 'on',
   :os_type_id => 'RedHat_64',
   :iso_file => "CentOS-6.2-x86_64-netinstall.iso",
-  :iso_src => "http://be.mirror.eurid.eu/centos/6.2/isos/x86_64/CentOS-6.2-x86_64-netinstall.iso",
+  :iso_src => "http://vault.centos.org/6.2/isos/x86_64/CentOS-6.2-x86_64-netinstall.iso",
   :iso_md5 => "7e7f4161a5c8c49032655e5f4ecd1f07",
   :iso_download_timeout => 1000,
   :boot_wait => "15",
-  :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
+  :boot_cmd_sequence => [
+    '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
+  ],
   :kickstart_port => "7122",
   :kickstart_timeout => 10000,
   :kickstart_file => "ks.cfg",
@@ -33,7 +33,8 @@ Veewee::Definition.declare({
     "virtualbox.sh",
     #"kvm.sh",
     #"vmfusion.sh",
-    "cleanup.sh"
+    "cleanup.sh",
+    "zerodisk.sh"
   ],
   :postinstall_timeout => 10000
 })

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

@@ -1,13 +1,13 @@
 install
-url --url=http://be.mirror.eurid.eu/centos/6.2/os/x86_64/
+url --url=http://vault.centos.org/6.2/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,30 +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
+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.2-x86_64-netboot/puppet.sh CHANGED

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

data/templates/CentOS-6.2-x86_64-netboot/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.2-x86_64-netboot/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.2-x86_64-netboot/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 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