deprec 2.1.4 → 2.1.5

data/CHANGELOG

@@ -1,5 +1,12 @@
 # deprec changelog
 
+= 2.1.5 (Dec  3, 2009)
+
+* collectd-4.8.1
+* haproxy-1.3.22
+* monit-5.0.3
+* don't install vim-full as it installs gnome
+
 = 2.1.4 (Sep 16, 2009)
 
 * rubygems-1.3.5 

data/lib/deprec/capistrano_extensions.rb

@@ -71,7 +71,7 @@ module Deprec2
       # render to remote machine
       puts 'You need to specify a path to render the template to!' unless path
       exit unless path
-      sudo "test -d #{File.dirname(path)} || sudo mkdir -p #{File.dirname(path)}"
+      sudo "test -d #{File.dirname(path)} || #{sudo} mkdir -p #{File.dirname(path)}"
       std.su_put rendered_template, path, '/tmp/', :mode => mode
       sudo "chown #{owner} #{path}" if defined?(owner)
     elsif path 
@@ -170,7 +170,7 @@ module Deprec2
         else
           full_remote_path = file[:path]
         end
-        sudo "test -d #{File.dirname(full_remote_path)} || sudo mkdir -p #{File.dirname(full_remote_path)}"
+        sudo "test -d #{File.dirname(full_remote_path)} || #{sudo} mkdir -p #{File.dirname(full_remote_path)}"
         std.su_put File.read(full_local_path), full_remote_path, '/tmp/', :mode=>file[:mode]
         sudo "chown #{file[:owner]} #{full_remote_path}"
       else
@@ -205,7 +205,7 @@ module Deprec2
     switches += " --shell=#{options[:shell]} " if options[:shell]
     switches += ' --create-home ' unless options[:homedir] == false
     switches += " --gid #{options[:group]} " unless options[:group].nil?
-    invoke_command "grep '^#{user}:' /etc/passwd || sudo /usr/sbin/useradd #{switches} #{user}", 
+    invoke_command "grep '^#{user}:' /etc/passwd || #{sudo} /usr/sbin/useradd #{switches} #{user}", 
     :via => run_method
   end
 
@@ -213,12 +213,12 @@ module Deprec2
   def groupadd(group, options={})
     via = options.delete(:via) || run_method
     # XXX I don't like specifying the path to groupadd - need to sort out paths before long
-    invoke_command "grep '#{group}:' /etc/group || sudo /usr/sbin/groupadd #{group}", :via => via
+    invoke_command "grep '#{group}:' /etc/group || #{sudo} /usr/sbin/groupadd #{group}", :via => via
   end
 
   # add group to the list of groups this user belongs to
   def add_user_to_group(user, group)
-    invoke_command "groups #{user} | grep ' #{group} ' || sudo /usr/sbin/usermod -G #{group} -a #{user}",
+    invoke_command "groups #{user} | grep ' #{group} ' || #{sudo} /usr/sbin/usermod -G #{group} -a #{user}",
     :via => run_method
   end
 

data/lib/deprec/recipes/collectd.rb

@@ -12,8 +12,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       # Copy collection-php to /var/www/collectd
 
       SRC_PACKAGES[:collectd] = {
-        :url => "http://collectd.org/files/collectd-4.7.2.tar.gz",
-        :md5sum => "893c7a861b7a4a591188d9468622d89d  collectd-4.7.2.tar.gz",
+        :url => "http://collectd.org/files/collectd-4.8.1.tar.gz",
+        :md5sum => "7e85183a129b566383e65332d2b863c5  collectd-4.8.1.tar.gz",
         :configure => "./configure --prefix=/usr/local;"
       }
 

data/lib/deprec/recipes/db/mysql.rb

@@ -11,6 +11,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Install mysql"
       task :install, :roles => :db do
         install_deps
+        config
         start
         # symlink_mysql_sockfile # XXX still needed?
       end
@@ -20,13 +21,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         apt.install( {:base => %w(mysql-server mysql-client libmysqlclient15-dev)}, :stable )
       end
       
-      # task :symlink_mysql_sockfile, :roles => :db do
-      #   # rails puts "socket: /tmp/mysql.sock" into config/database.yml
-      #   # this is not the location for our ubuntu's mysql socket file
-      #   # so we create this link to make deployment using rails defaults simpler
-      #   sudo "ln -sf /var/run/mysqld/mysqld.sock /tmp/mysql.sock"
-      # end
-      
       # Configuration
       
       SYSTEM_CONFIG_FILES[:mysql] = [
@@ -47,6 +41,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Push mysql config files to server"
       task :config, :roles => :db do
         deprec2.push_configs(:mysql, SYSTEM_CONFIG_FILES[:mysql])
+        reload
       end
       
       task :activate, :roles => :db do

data/lib/deprec/recipes/haproxy.rb

@@ -4,8 +4,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :haproxy do
       
       SRC_PACKAGES[:haproxy] = {
-        :md5sum => "e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz",  
-        :url => "http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.20.tar.gz"
+        :md5sum => "b84e0935cfea99eda43645d53bb82367  haproxy-1.3.22.tar.gz",  
+        :url => "http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.22.tar.gz"
       }
       
       desc "Install haproxy"

data/lib/deprec/recipes/monit.rb

@@ -30,17 +30,8 @@ Capistrano::Configuration.instance(:must_exist).load do
   # Upstream changes: http://www.tildeslash.com/monit/dist/CHANGES.txt  
   # Ubuntu package version = monit-4.8.1  
   SRC_PACKAGES[:monit] = {
-    :filename => 'monit-4.10.1.tar.gz',   
-    :md5sum => "d3143b0bbd79b53f1b019d2fc1dae656  monit-4.10.1.tar.gz", 
-    :dir => 'monit-4.10.1',  
-    :url => "http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz",
-    :unpack => "tar zxf monit-4.10.1.tar.gz;",
-    :configure => %w(
-      ./configure
-      ;
-      ).reject{|arg| arg.match '#'}.join(' '),
-    :make => 'make;',
-    :install => 'make install;'
+    :md5sum => "dae7859ec10551fc941daeae60dee9d3  monit-5.0.3.tar.gz", 
+    :url => "http://mmonit.com/monit/dist/monit-5.0.3.tar.gz"
   }
   
   desc "Install monit"

data/lib/deprec/recipes/network.rb

@@ -49,34 +49,58 @@ Capistrano::Configuration.instance(:must_exist).load do
         end 
       }
       
-      SYSTEM_CONFIG_FILES[:network] = [
+      # Non standard deprec!
+      #
+      # I might move to making this standard in future. It makes it easier to 
+      # override individual config files in local recipes. - Mike
+      #
+      SYSTEM_CONFIG_FILES[:network] = {
 
-        {:template => "interfaces.erb",
-          :path => '/etc/network/interfaces',
-          :mode => 0644,
-          :owner => 'root:root'},
-
-        {:template => "hosts.erb",
-         :path => '/etc/hosts',
-         :mode => 0644,
-         :owner => 'root:root'},
+        :interfaces => {
+           :template => "interfaces.erb",
+           :path => '/etc/network/interfaces',
+           :mode => 0644,
+           :owner => 'root:root',
+           :remote => true
+        },
+        
+        :hosts => {
+           :template => "hosts.erb",
+           :path => '/etc/hosts',
+           :mode => 0644,
+           :owner => 'root:root',
+           :remote => true
+        },
 
-        {:template => "hostname.erb",
-         :path => '/etc/hostname',
-         :mode => 0644,
-         :owner => 'root:root'},
+        :hostname => {
+            :template => "hostname.erb",
+            :path => '/etc/hostname',
+            :mode => 0644,
+            :owner => 'root:root',
+            :remote => true
+        },
          
-        {:template => "resolv.conf.erb",
-         :path => '/etc/resolv.conf',
-         :mode => 0644,
-         :owner => 'root:root'}
+        :resolv => {
+          :template => "resolv.conf.erb",
+          :path => '/etc/resolv.conf',
+          :mode => 0644,
+          :owner => 'root:root',
+          :remote => true
+        }
+      }
     
-       ]
-       
+      
+      SYSTEM_CONFIG_FILES[:network].each do |file, details|
+        desc "Generate and push #{details[:path]}"
+        task file.to_sym do
+          deprec2.render_template(:network, details)
+        end
+      end
+      
       # XXX need to set the order for these as it breaks sudo currently
       desc "Update system networking configuration"
       task :config do
-        SYSTEM_CONFIG_FILES[:network].each do |file|
+        SYSTEM_CONFIG_FILES[:network].values.each do |file|
           deprec2.render_template(:network, file.merge(:remote=>true))
         end
       end
@@ -85,9 +109,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :restart do
         sudo '/etc/init.d/networking restart'
       end
-      
-      
+            
     end
   end
   
-end
+end

data/lib/deprec/recipes/utils.rb

@@ -41,7 +41,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         desc "Install some useful utils"
         task :other do
-          apps = %w(lsof vim-full tree psmisc screen)
+          apps = %w(lsof vim tree psmisc screen)
           apt.install( {:base => apps}, :stable )
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors: 
 - Mike Bailey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 +10:00
+date: 2009-12-03 00:00:00 +11:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency