a few updates

This commit is contained in:
John Bintz 2012-01-30 11:39:18 -05:00
parent 1570e842bb
commit 7ee98959d6
2 changed files with 18 additions and 8 deletions

View File

@ -47,7 +47,7 @@ Capistrano::Configuration.instance.load do
desc "Rename the server" desc "Rename the server"
task :rename do task :rename do
hostname = Capistrano::CLI.ui.ask("Hostname: ") hostname = fetch(:hostname) || Capistrano::CLI.ui.ask("Hostname: ")
top.copy_skel top.copy_skel
run "cd #{puppet_dir} && #{sudo} ./rename #{hostname}" run "cd #{puppet_dir} && #{sudo} ./rename #{hostname}"
@ -57,7 +57,11 @@ Capistrano::Configuration.instance.load do
task :copy do task :copy do
top.ensure_puppet_dir top.ensure_puppet_dir
Dir["*"].each { |file| top.upload file, File.join(puppet_dir, file) } Dir["*"].each do |file|
if !%w{vbox}.include?(file)
top.upload file, File.join(puppet_dir, file)
end
end
end end
desc "Copy skel files to remote server" desc "Copy skel files to remote server"

View File

@ -5,12 +5,18 @@ if [ ! $UID -eq 0 ]; then
exit exit
fi fi
apt-get update export DEBIAN_FRONTEND=noninteractive
apt-get -y upgrade export PAGER=cat
apt-get -y dist-upgrade
apt-get install -y rubygems1.8 puppet apt-get --force-yes update
apt-get remove -y puppet facter apt-get --force-yes -y upgrade
apt-get --force-yes -y dist-upgrade
apt-get install --force-yes -y rubygems1.8 puppet
apt-get remove --force-yes -y puppet facter
gem install puppet --no-ri --no-rdoc gem install puppet --no-ri --no-rdoc
./apply ./apply
shutdown -r now shutdown -r now