Merge pull request #244 from ichilton/master

Ubuntu 10.04.4
jedi4ever · Feb 21, 2012 · 15bdd09 · 15bdd09
2 parents 4a20b75 + f4d4268
commit 15bdd09
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/...4-server-amd64-experimental/definition.rb → ...ubuntu-10.04.4-server-amd64/definition.rb b/...4-server-amd64-experimental/definition.rb → ...ubuntu-10.04.4-server-amd64/definition.rb
diff --git a/...-server-amd64-experimental/postinstall.sh → ...buntu-10.04.4-server-amd64/postinstall.sh b/...-server-amd64-experimental/postinstall.sh → ...buntu-10.04.4-server-amd64/postinstall.sh
@@ -31,13 +31,13 @@ make install
 cd ..
 rm -rf ruby-1.8.7-p334*
 
-# Install RubyGems 1.7.2
-wget http://production.cf.rubygems.org/rubygems/rubygems-1.7.2.tgz
-tar xzf rubygems-1.7.2.tgz
-cd rubygems-1.7.2
+# Install RubyGems 1.8.17
+wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.17.tgz
+tar xzf rubygems-1.8.17.tgz
+cd rubygems-1.8.17
 /opt/ruby/bin/ruby setup.rb
 cd ..
-rm -rf rubygems-1.7.2*
+rm -rf rubygems-1.8.17*
 
 # Installing chef & Puppet
 /opt/ruby/bin/gem install chef --no-ri --no-rdoc

diff --git a/...4.4-server-amd64-experimental/preseed.cfg → ...s/ubuntu-10.04.4-server-amd64/preseed.cfg b/...4.4-server-amd64-experimental/preseed.cfg → ...s/ubuntu-10.04.4-server-amd64/preseed.cfg
diff --git a/...4.4-server-i38-experimental/definition.rb → .../ubuntu-10.04.4-server-i386/definition.rb b/...4.4-server-i38-experimental/definition.rb → .../ubuntu-10.04.4-server-i386/definition.rb
diff --git a/....4-server-i38-experimental/postinstall.sh → ...ubuntu-10.04.4-server-i386/postinstall.sh b/....4-server-i38-experimental/postinstall.sh → ...ubuntu-10.04.4-server-i386/postinstall.sh
@@ -31,13 +31,13 @@ make install
 cd ..
 rm -rf ruby-1.8.7-p334*
 
-# Install RubyGems 1.7.2
-wget http://production.cf.rubygems.org/rubygems/rubygems-1.7.2.tgz
-tar xzf rubygems-1.7.2.tgz
-cd rubygems-1.7.2
+# Install RubyGems 1.8.17
+wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.17.tgz
+tar xzf rubygems-1.8.17.tgz
+cd rubygems-1.8.17
 /opt/ruby/bin/ruby setup.rb
 cd ..
-rm -rf rubygems-1.7.2*
+rm -rf rubygems-1.8.17*
 
 # Installing chef & Puppet
 /opt/ruby/bin/gem install chef --no-ri --no-rdoc

diff --git a/....04.4-server-i38-experimental/preseed.cfg → ...es/ubuntu-10.04.4-server-i386/preseed.cfg b/....04.4-server-i38-experimental/preseed.cfg → ...es/ubuntu-10.04.4-server-i386/preseed.cfg