deprec 2.0.10 → 2.0.11

data/CHANGELOG

@@ -1,5 +1,13 @@
 == git
 
+== 2.0.12 (June 24, 2009)
+
+* Updated chef recipes
+
+== 2.0.11 (June 19, 2009)
+
+* Security update: ruby-1.8.7-p174
+
 == 2.0.10 (June 14, 2009)
 
 * Added CouchDB

data/lib/deprec/recipes/app/mongrel.rb

@@ -111,7 +111,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
       task :symlink_apache_vhost, :roles => :app do
-        sudo "ln -sf #{deploy_to}/mongrel/apache_vhost.conf #{apache_vhost_dir}/#{application}.conf"
+        sudo "ln -sf #{deploy_to}/mongrel/apache_vhost.conf #{apache_vhost_dir}/#{application}"
       end
       
       task :symlink_nginx_vhost, :roles => :app do

data/lib/deprec/recipes/chef.rb

@@ -3,21 +3,37 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do 
     namespace :chef do
       
+      set(:server_fqdn) { Capistrano::CLI.ui.ask 'Enter Chef server hostname' }
+      set(:recipes) { "chef::#{install_type}" }
+      
+      default(:install_type) do
+        Capistrano::CLI.ui.choose do |menu| 
+          %w(client server).each {|c| menu.choice(c)}
+          menu.header = "Select Chef version to install"
+        end
+      end
+      
       desc "Install Chef"
       task :install do
+        config # Do this first so we can ensure we have any user input
         install_deps
-        sudo "gem sources -a http://gems.opscode.com"
-        sudo "gem install ohai chef --no-rdoc --no-ri"
-        config
-        sudo "sudo chef-solo -c /etc/chef/solo.rb -j /etc/chef/solo/chef.json -r http://s3.amazonaws.com/chef-solo/bootstrap-latest.tar.gz"
+        run_solo
+        top.deprec.apache.restart if install_type == 'server'
+      end
+      
+      desc "Run chef-solo to setup on server"
+      task :run_solo do
+        sudo 'chef-solo -c /etc/chef/solo.rb -j /etc/chef/chef.json -r http://s3.amazonaws.com/chef-solo/bootstrap-latest.tar.gz'
       end
       
       # Install dependencies for Chef
       task :install_deps, :roles => :chef do
-        top.deprec.couchdb.install
-        # top.deprec.ruby.install # XXX can we put this back in?
-        apt.install( {:base => %w(ruby ruby1.8-dev libopenssl-ruby1.8 rdoc ri irb)}, :stable )
+        top.deprec.couchdb.install if install_type == 'server'
+        # apt.install( {:base => %w(ruby ruby1.8-dev libopenssl-ruby1.8 rdoc ri irb)}, :stable )
+        top.deprec.ruby.install
         top.deprec.rubygems.install
+        sudo "gem sources -a http://gems.opscode.com"
+        sudo "gem install ohai chef --no-rdoc --no-ri"
       end
       
       SYSTEM_CONFIG_FILES[:chef] = [
@@ -27,8 +43,8 @@ Capistrano::Configuration.instance(:must_exist).load do
          :mode => 0644,
          :owner => 'root:root'},
          
-        {:template => "chef.json",
-         :path => '/etc/chef/solo/chef.json',
+        {:template => "chef.json.erb",
+         :path => '/etc/chef/chef.json',
          :mode => 0644,
          :owner => 'root:root'}
          
@@ -46,36 +62,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         deprec2.push_configs(:chef, SYSTEM_CONFIG_FILES[:chef])
       end
       
-      # desc "Set Chef to start on boot"
-      # task :activate, :roles => :chef do
-      #   send(run_method, "update-rc.d chef defaults")
-      # end
-      # 
-      # desc "Set Chef to not start on boot"
-      # task :deactivate, :roles => :chef do
-      #   send(run_method, "update-rc.d -f chef remove")
-      # end
-      # 
-      # desc "Start Chef"
-      # task :start, :roles => :web do
-      #   send(run_method, "/etc/init.d/chef start")
-      # end
-      # 
-      # desc "Stop Chef"
-      # task :stop, :roles => :web do
-      #   send(run_method, "/etc/init.d/chef stop")
-      # end
-      # 
-      # desc "Restart Chef"
-      # task :restart, :roles => :web do
-      #   send(run_method, "/etc/init.d/chef restart")
-      # end
-      # 
-      # desc "Reload Chef"
-      # task :reload, :roles => :web do
-      #   send(run_method, "/etc/init.d/chef force-reload")
-      # end
-      
     end
     
   end

data/lib/deprec/recipes/git.rb

@@ -10,8 +10,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :git_root, '/var/git'
 
       SRC_PACKAGES[:git] = {
-        :url => "http://kernel.org/pub/software/scm/git/git-1.6.1.tar.gz",
-        :md5sum => "1f915929d4f54a2e0449a4a08f093118  git-1.6.1.tar.gz"
+        :url => "http://kernel.org/pub/software/scm/git/git-1.6.3.2.tar.gz",
+        :md5sum => "c9819ba1ad3edbcf3b5de3116048d59f  git-1.6.3.2.tar.gz"
       }
 
       desc "Install git"

data/lib/deprec/recipes/ruby/mri.rb

@@ -5,8 +5,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :mri do
             
       SRC_PACKAGES[:mri] = {
-        :md5sum => "5e5b7189674b3a7f69401284f6a7a36d  ruby-1.8.7-p72.tar.gz", 
-        :url => "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.gz",
+        :md5sum => "18dcdfef761a745ac7da45b61776afa5  ruby-1.8.7-p174.tar.gz", 
+        :url => "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p174.tar.gz",
         :configure => "./configure --with-readline-dir=/usr/local;"
       }
   

data/lib/deprec/recipes/xen.rb

@@ -17,7 +17,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         install_deps
         top.deprec.xentools.install
         disable_apparmour
-        disable_tls
         # enable_hardy_domu Should only be run on gutsy
         initial_config
       end
@@ -27,7 +26,8 @@ Capistrano::Configuration.instance(:must_exist).load do
         # apt.install( {:base => %w(linux-image-xen bridge-utils libxen3.1 python-xen-3.1 xen-docs-3.1 xen-hypervisor-3.1 xen-ioemu-3.1 xen-tools xen-utils-3.1 lvm2)}, :stable )
         # alternatively, for x86 version of ubuntu:
         # apt-get install ubuntu-xen-server libc6-xen lvm2    
-        apt.install( {:base => %w(ubuntu-xen-server libc6-xen lvm2)}, :stable )
+        # apt.install( {:base => %w(ubuntu-xen-server libc6-xen lvm2)}, :stable )
+        apt.install( {:base => %w(ubuntu-xen-server lvm2)}, :stable )
         
       end
       
@@ -36,9 +36,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         sudo 'update-rc.d -f apparmor remove'
       end
       
-      task :disable_tls, :roles => :dom0 do
-        sudo 'mv /lib/tls /lib/tls.disabled'
-      end
+      # task :disable_tls, :roles => :dom0 do
+      #   sudo 'mv /lib/tls /lib/tls.disabled'
+      # end
       
       SYSTEM_CONFIG_FILES[:xen] = [
                 

data/lib/deprec/recipes_minus_rails.rb

@@ -51,7 +51,7 @@ require "#{File.dirname(__FILE__)}/recipes/lvm"
 require "#{File.dirname(__FILE__)}/recipes/vnstat"
 require "#{File.dirname(__FILE__)}/recipes/sphinx"
 require "#{File.dirname(__FILE__)}/recipes/utils"
-require "#{File.dirname(__FILE__)}/recipes/apt_mirror"
+# require "#{File.dirname(__FILE__)}/recipes/apt_mirror"
 # require "#{File.dirname(__FILE__)}/recipes/wordpress" Not working
 require "#{File.dirname(__FILE__)}/recipes/wpmu"
 require "#{File.dirname(__FILE__)}/recipes/ar_sendmail"

data/lib/deprec/templates/chef/chef.json.erb

@@ -0,0 +1 @@
+{ "chef": { "server_fqdn": "<%= server_fqdn %>" }, "recipes": "<%= recipes %>" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors: 
 - Mike Bailey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 +10:00
+date: 2009-06-24 00:00:00 +10:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,6 @@ files:
 - lib/deprec/recipes/aoe.rb
 - lib/deprec/recipes/app/mongrel.rb
 - lib/deprec/recipes/app/passenger.rb
-- lib/deprec/recipes/apt_mirror.rb
 - lib/deprec/recipes/ar_sendmail.rb
 - lib/deprec/recipes/canonical.rb
 - lib/deprec/recipes/chef.rb
@@ -96,12 +95,9 @@ files:
 - lib/deprec/templates/aoe/aoe-init
 - lib/deprec/templates/aoe/fence_aoemask
 - lib/deprec/templates/apache/namevirtualhosts.conf
-- lib/deprec/templates/apt/sources.list
-- lib/deprec/templates/apt_mirror/apt-mirror-cron
-- lib/deprec/templates/apt_mirror/mirror.list
 - lib/deprec/templates/ar_sendmail/logrotate.conf.erb
 - lib/deprec/templates/ar_sendmail/monit.conf.erb
-- lib/deprec/templates/chef/chef.json
+- lib/deprec/templates/chef/chef.json.erb
 - lib/deprec/templates/chef/solo.rb
 - lib/deprec/templates/ddclient/ddclient.conf.erb
 - lib/deprec/templates/ddclient/ddclient.erb

data/lib/deprec/recipes/apt_mirror.rb

@@ -1,98 +0,0 @@
-# Copyright 2006-2008 by Mike Bailey. All rights reserved.
-Capistrano::Configuration.instance(:must_exist).load do 
-  # ref: http://www.howtoforge.com/local_debian_ubuntu_mirror
-  namespace :deprec do 
-
-    set :apt_mirror_hostname, 'archive.ubuntu.com'
-    set :apt_releases_to_mirror, %w(gutsy)
-
-    namespace :apt_normal do # XXX Find a better name
-                             # :apt was clashing with the vmbuilder plugin
-
-      SYSTEM_CONFIG_FILES[:apt] = [
-
-        {:template => 'sources.list',
-          :path => '/etc/apt/sources.list',
-          :mode => 0755,
-          :owner => 'root:root'}
-      ]
-      
-      desc <<-DESC
-      Generate apt config from template. Note that this does not
-      push the config to the server, it merely generates required
-      configuration files. These should be kept under source control.            
-      The can be pushed to the server with the :config task.
-      DESC
-      task :config_gen do
-        SYSTEM_CONFIG_FILES[:apt].each do |file|
-          deprec2.render_template(:apt, file)
-        end
-      end
-
-      desc "Push apt_mirror config files to server"
-      task :config do
-        deprec2.push_configs(:apt, SYSTEM_CONFIG_FILES[:apt])
-      end
-      
-    end
-    
-    namespace :apt_mirror do
-      
-      desc "Install apt-mirror"
-      task :install, :roles => :apt_mirror do
-        install_deps
-        SYSTEM_CONFIG_FILES[:apt_mirror].each do |file|
-          deprec2.render_template(:apt_mirror, file.merge(:remote => true))
-        end
-      end
-
-      # install dependencies for apt_mirror
-      task :install_deps do
-        apt.install( {:base => %w(apt-mirror apache2 cron)}, :stable )
-      end
-
-      SYSTEM_CONFIG_FILES[:apt_mirror] = [
-
-        {:template => 'mirror.list',
-          :path => '/etc/apt/mirror.list',
-          :mode => 0755,
-          :owner => 'root:root'},
-        
-        {:template => 'apt-mirror-cron',
-          :path => '/etc/cron.d/apt-mirror',
-          :mode => 0755,
-          :owner => 'root:root'}
-      ]
-
-      desc <<-DESC
-      Generate apt_mirror config from template. Note that this does not
-      push the config to the server, it merely generates required
-      configuration files. These should be kept under source control.            
-      The can be pushed to the server with the :config task.
-      DESC
-      task :config_gen do
-        SYSTEM_CONFIG_FILES[:apt_mirror].each do |file|
-          deprec2.render_template(:apt_mirror, file)
-        end
-      end
-
-      desc "Push apt_mirror config files to server"
-      task :config, :roles => :apt_mirror do
-        deprec2.push_configs(:apt_mirror, SYSTEM_CONFIG_FILES[:apt_mirror])
-      end
-
-      # Create mirror for the first time
-      # 
-      # su - apt-mirror -c apt-mirror
-      
-      # Add cron job to update
-      
-      # Symlink for apache
-      # ln -s /var/spool/apt-mirror/mirror/de.archive.ubuntu.com/ubuntu /var/www/ubuntu
-
-      # Update sources.list on all hosts:
-      # deb http://192.168.0.100/ubuntu/ gutsy main restricted universe
-      
-    end 
-  end
-end

data/lib/deprec/templates/apt/sources.list

@@ -1,18 +0,0 @@
-#
-#  /etc/apt/sources.list
-#
-
-
-#
-# gutsy
-#
-deb		http://<%= apt_mirror_hostname %>/ubuntu gutsy main restricted universe multiverse
-deb     http://archive.ubuntu.com/ubuntu     gutsy-updates main restricted universe multiverse
-deb http://security.ubuntu.com/ubuntu gutsy-security main restricted universe
-
-deb-src http://archive.ubuntu.com/ubuntu     gutsy main restricted universe
-deb-src http://archive.ubuntu.com/ubuntu     gutsy-updates main restricted universe
-deb-src http://security.ubuntu.com/ubuntu gutsy-security main restricted universe
-
-
-

data/lib/deprec/templates/apt_mirror/apt-mirror-cron

@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the apt-mirror package
-#
-0 4     * * *   apt-mirror      /usr/bin/apt-mirror > /var/spool/apt-mirror/var/cron.log

data/lib/deprec/templates/apt_mirror/mirror.list

@@ -1,33 +0,0 @@
-############# config ##################
-#
-# set base_path    /var/spool/apt-mirror
-#
-# if you change the base path you must create the directories below with write privlages
-#
-# set mirror_path  $base_path/mirror
-# set skel_path    $base_path/skel
-# set var_path     $base_path/var
-# set cleanscript $var_path/clean.sh
-# set defaultarch  <running host architecture>
-set nthreads     20
-set _tilde 0
-#
-############# end config ##############
-
-<% Array(apt_releases_to_mirror).each do |release| %> 
-# <%= release %>
-deb http://archive.ubuntu.com/ubuntu <%= release %> main restricted universe multiverse
-#deb http://archive.ubuntu.com/ubuntu <%= release %>-updates main restricted universe multiverse
-#deb http://archive.ubuntu.com/ubuntu <%= release %>-backports main restricted universe multiverse
-#deb http://archive.ubuntu.com/ubuntu <%= release %>-security main restricted universe multiverse
-#deb http://archive.ubuntu.com/ubuntu <%= release %>-proposed main restricted universe multiverse
-
-deb-src http://archive.ubuntu.com/ubuntu <%= release %> main restricted universe multiverse
-#deb-src http://archive.ubuntu.com/ubuntu <%= release %>-updates main restricted universe multiverse
-#deb-src http://archive.ubuntu.com/ubuntu <%= release %>-backports main restricted universe multiverse
-#deb-src http://archive.ubuntu.com/ubuntu <%= release %>-security main restricted universe multiverse
-#deb-src http://archive.ubuntu.com/ubuntu <%= release %>-proposed main restricted universe multiverse
-<% end %>
-
-clean http://archive.ubuntu.com/ubuntu
-

data/lib/deprec/templates/chef/chef.json

@@ -1 +0,0 @@
-{ "recipes": "chef::server" }