deprec 2.1.1 → 2.1.4

data/CHANGELOG

@@ -1,5 +1,15 @@
 # deprec changelog
 
+= 2.1.4 (Sep 16, 2009)
+
+* rubygems-1.3.5 
+* git-1.6.4.3 
+
+= 2.1.2 (Aug 26, 2009)
+
+* Better support for Capistrano multistage
+  Look for database.yml in config/#{stage}/database.yml
+
 = 2.1.1 (Aug 25, 2009)
 
 * Added haproxy

data/bin/depify

@@ -58,7 +58,7 @@ files = {
     # Update these if you're not running everything on one host.
     role :app, domain
     role :web, domain
-    role :db,  domain, :primary => true
+    role :db,  domain, :primary => true, :no_release => true
 
     # If you aren't deploying to /opt/apps/\#{application} on the target
     # servers (which is the deprec default), you can specify the actual location

data/lib/deprec/capistrano_extensions.rb

@@ -330,7 +330,8 @@ module Deprec2
   end
   
   def read_database_yml
-    db_config = YAML.load_file('config/database.yml')
+    stage = exists?(:stage) ? fetch(:stage).to_s : ''
+    db_config = YAML.load_file(File.join('config', stage, 'database.yml'))
     set :db_user, db_config[rails_env]["username"]
     set :db_password, db_config[rails_env]["password"] 
     set :db_name, db_config[rails_env]["database"]

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

@@ -201,7 +201,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Restart Application"
       task :restart, :roles => :app do
-        run "touch #{current_path}/tmp/restart.txt"
+        run "#{sudo} touch #{current_path}/tmp/restart.txt"
       end
       
       desc "Restart Apache"

data/lib/deprec/recipes/collectd.rb

@@ -18,14 +18,16 @@ Capistrano::Configuration.instance(:must_exist).load do
       }
 
       desc "Install collectd"
-      task :install do
+      task :install, :roles => :all_hosts do
         install_deps
         deprec2.download_src(SRC_PACKAGES[:collectd], src_dir)
         deprec2.install_from_src(SRC_PACKAGES[:collectd], src_dir)
+        config
+        activate
       end
 
       # install dependencies for sysklogd
-      task :install_deps do
+      task :install_deps, :roles => :all_hosts do
         apt.install( {:base => %w(liboping-dev libcurl4-openssl-dev libperl-dev libdbi0-dev libesmtp-dev libganglia1-dev libmemcache-dev libnet1-dev libnotify-dev libopenipmi-dev liboping-dev libpcap-dev libperl-dev librrd2-dev libsensors-dev libstatgrab-dev libvirt-dev
 rrdtool librrd2-dev librrds-perl libconfig-general-perl libhtml-parser-perl  libregexp-common-perl)}, :stable )
       end
@@ -37,6 +39,11 @@ rrdtool librrd2-dev librrds-perl libconfig-general-perl libhtml-parser-perl  lib
          :mode => 0640,
          :owner => 'root:root'},
          
+        {:template => "collectd-init.d",
+         :path => '/etc/init.d/collectd',
+         :mode => 0755,
+         :owner => 'root:root'}
+         
       ]
            
       desc "Generate Collectd configs"
@@ -49,23 +56,35 @@ rrdtool librrd2-dev librrds-perl libconfig-general-perl libhtml-parser-perl  lib
       desc "Push Chef config files (system & project level) to server"
       task :config, :roles => :all_hosts, :except => {:collectd_master => true} do
         deprec2.push_configs(:collectd, SYSTEM_CONFIG_FILES[:collectd])
-        restart
+        reload
       end
 
       desc "Start collectd"
       task :start, :roles => :all_hosts, :except => { :collectd_master => true } do
-        run "#{sudo} collectd"
+        run "#{sudo} /etc/init.d/collectd start"
       end
       
       desc "Stop collectd"
       task :stop, :roles => :all_hosts, :except => { :collectd_master => true } do
-        run "#{sudo} killall collectd; exit 0;"
+        run "#{sudo} /etc/init.d/collectd stop"
       end
       
       desc "Restart collectd"
       task :restart, :roles => :all_hosts, :except => { :collectd_master => true } do
-        stop
-        start
+        run "#{sudo} /etc/init.d/collectd restart"
+      end
+      
+      desc "Reload collectd"
+      task :reload, :roles => :all_hosts, :except => { :collectd_master => true } do
+        run "#{sudo} /etc/init.d/collectd force-reload"
+      end
+      
+      task :activate, :roles => :all_hosts, :except => { :collectd_master => true } do
+        run "#{sudo} update-rc.d collectd defaults"
+      end  
+      
+      task :deactivate, :roles => :all_hosts, :except => { :collectd_master => true }do
+        run "#{sudo} update-rc.d -f collectd remove"
       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.3.2.tar.gz",
-        :md5sum => "c9819ba1ad3edbcf3b5de3116048d59f  git-1.6.3.2.tar.gz"
+        :url => "http://kernel.org/pub/software/scm/git/git-1.6.4.3.tar.gz",
+        :md5sum => "95381cd27ad762c645c8e07f922879ce  git-1.6.4.3.tar.gz"
       }
 
       desc "Install git"

data/lib/deprec/recipes/gitosis.rb

@@ -1,48 +1,55 @@
-# Copyright 2006-2008 by Mike Bailey. All rights reserved.
-Capistrano::Configuration.instance(:must_exist).load do 
-  namespace :deprec do 
-    namespace :gitosis do
-      
-      # ref: http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way
-
-      set :gitosis_user, 'git'
-
-      desc "Install git"
-      task :install do
-        deprec2.create_src_dir
-        install_deps
-        run <<-SUDO
-          cd #{src_dir} && test -d gitosis || #{sudo} git clone git://eagain.net/gitosis.git; exit 0
-        SUDO
-        run "cd #{src_dir}/gitosis && #{sudo} python setup.py install"
-        create_user
-        init
-      end
-
-      # install dependencies for nginx
-      task :install_deps do
-        apt.install( {:base => %w(python-setuptools)}, :stable )
-      end
-
-      # Create user for gitosis to run as
-      # This will also be the account you use for ssh access to git
-      task :create_user do
-        run "grep '^#{gitosis_user}:' /etc/passwd || #{sudo} adduser --system --shell /bin/sh --gecos 'git version control' --group --disabled-password --home /home/#{gitosis_user} #{gitosis_user}"
-        sudo "passwd --unlock #{gitosis_user}"
-      end
-      
-      task :init do
-        sudo "sudo -H -u #{git_user} gitosis-init < ~/.ssh/authorized_keys"
-        sudo "chmod 0755 /home/git/repositories/gitosis-admin.git/hooks/post-update" 
-        puts
-        puts "Now check out the gitosis-admin repos, edit configs and push changes back"
-        puts "Your changes with update gitosis as soon as they are checked in."
-        puts
-        puts "git clone git@YOUR_SERVER_HOSTNAME:gitosis-admin.git"
-        puts "cd gitosis-admin"
-        puts ""
-      end
-
-    end 
-  end
-end
+# Not working
+#
+# # Copyright 2006-2008 by Mike Bailey. All rights reserved.
+# Capistrano::Configuration.instance(:must_exist).load do 
+#   namespace :deprec do 
+#     namespace :gitosis do
+#       
+#       # ref: http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way
+# 
+#       set :gitosis_user, 'git'
+# 
+#       SRC_PACKAGES[:gitosis] = {
+#         :url => "git://eagain.net/gitosis.git",
+#         :download_method => :git,
+#         :configure => '',
+#         :make => '',
+#         :install => '#{sudo} python setup.py install'
+#       }
+#       
+#       desc "Install gitosis"
+#       task :install do
+#         install_deps
+#         deprec2.download_src(SRC_PACKAGES[:gitosis], src_dir)
+#         deprec2.install_from_src(SRC_PACKAGES[:gitosis], src_dir)
+#         create_user
+#         init
+#       end
+# 
+#       # install dependencies for nginx
+#       task :install_deps do
+#         apt.install( {:base => %w(python-setuptools)}, :stable )
+#       end
+# 
+#       # Create user for gitosis to run as
+#       # This will also be the account you use for ssh access to git
+#       task :create_user do
+#         run "grep '^#{gitosis_user}:' /etc/passwd || #{sudo} adduser --system --shell /bin/sh --gecos 'git version control' --group --disabled-password --home /home/#{gitosis_user} #{gitosis_user}"
+#         sudo "passwd --unlock #{gitosis_user}"
+#       end
+#       
+#       task :init do
+#         sudo "sudo -H -u #{git_user} gitosis-init < ~/.ssh/authorized_keys"
+#         sudo "chmod 0755 /home/git/repositories/gitosis-admin.git/hooks/post-update" 
+#         puts
+#         puts "Now check out the gitosis-admin repo, edit configs and push changes back"
+#         puts "Your changes with update gitosis as soon as they are checked in."
+#         puts
+#         puts "git clone git@YOUR_SERVER_HOSTNAME:gitosis-admin.git"
+#         puts "cd gitosis-admin"
+#         puts ""
+#       end
+# 
+#     end 
+#   end
+# end

data/lib/deprec/recipes/haproxy.rb

@@ -9,13 +9,15 @@ Capistrano::Configuration.instance(:must_exist).load do
       }
       
       desc "Install haproxy"
-      task :install do
+      task :install, :roles => :haproxy do
         install_deps
         deprec2.download_src(SRC_PACKAGES[:haproxy], src_dir)
         deprec2.install_from_src(SRC_PACKAGES[:haproxy], src_dir)
+        config
+        activate
       end
       
-      task :install_deps do
+      task :install_deps, :roles => :haproxy do
         apt.install( {:base => %w(build-essential)}, :stable )
       end
       
@@ -62,7 +64,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc 'Deploy configuration filess for haproxy' 
       task :config, :roles => :haproxy do
         config_system
-        config_project
+        # config_project
+        reload
       end
 
       task :config_system, :roles => :haproxy do
@@ -100,4 +103,4 @@ Capistrano::Configuration.instance(:must_exist).load do
       
     end
   end
-end
+end

data/lib/deprec/recipes/integrity.rb

@@ -35,7 +35,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       # Install dependencies for Integrity
       task :install_deps, :roles => :ci do
-        apt.install( {:base => %w(sqlite3 libsqlite3-dev git libxslt1-dev libxml2-dev)}, :stable )
+        apt.install( {:base => %w(postfix sqlite3 libsqlite3-dev git libxslt1-dev libxml2-dev)}, :stable )
         gem2.install 'sqlite3-ruby'
         gem2.install 'do_sqlite3'
         # Gems your tests might need

data/lib/deprec/recipes/rails.rb

@@ -142,14 +142,13 @@ Capistrano::Configuration.instance(:must_exist).load do
       # XXX This should be restricted a bit to limit what app can write to. - Mike
       desc "set group ownership and permissions on dirs app server needs to write to"
       task :make_writable_by_app, :roles => :app do
-        tmp_dir = "#{deploy_to}/current/tmp"
-        shared_dir = "#{deploy_to}/shared"
-        # XXX Factor this out
-        files = ["#{mongrel_log_dir}/mongrel.log", "#{mongrel_log_dir}/#{rails_env}.log"]
-
-        sudo "chgrp -R #{app_group} #{tmp_dir} #{shared_dir}"
-        sudo "chmod -R g+w #{tmp_dir} #{shared_dir}" 
+        dirs = "#{shared_path} #{current_path}/tmp #{current_path}/public"
+        sudo "chgrp -R #{app_group} #{dirs}"
+        sudo "chmod -R g+w #{dirs}" 
+        
         # set owner and group of log files 
+        # XXX Factor out mongrel
+        files = ["#{mongrel_log_dir}/mongrel.log", "#{mongrel_log_dir}/#{rails_env}.log"]
         files.each { |file|
           sudo "touch #{file}"
           sudo "chown #{app_user} #{file}"   
@@ -286,13 +285,15 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Link in the production database.yml" 
       task :symlink_database_yml, :roles => :app do
-        run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
+        run "#{sudo} ln -nfs #{shared_path}/config/database.yml #{current_path}/config/database.yml" 
       end
       
       desc "Copy database.yml to shared/config/database.yml. Useful if not kept in scm"
       task :push_database_yml, :roles => :app do
-        if File.exists?('config/database.yml')
-          put(File.read('config/database.yml'), "#{shared_path}/config/database.yml")
+        stage = exists?(:stage) ? fetch(:stage).to_s : ''
+        full_local_path = File.join('config', stage, 'database.yml')
+        if File.exists?(full_local_path)
+          std.su_put(File.read(full_local_path), "#{shared_path}/config/database.yml", '/tmp/')
         end
       end
       

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

@@ -30,10 +30,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :rubygems do
   
       SRC_PACKAGES[:rubygems] = {
-        :md5sum => "b17b398503253bf36a101c58f02a226f  rubygems-1.3.4.tgz", 
-        :url => "http://rubyforge.org/frs/download.php/57643/rubygems-1.3.4.tgz",
-	      :configure => "",
-	      :make =>  "",
+        :md5sum => "6e317335898e73beab15623cdd5f8cff  rubygems-1.3.5.tgz", 
+        :url => "http://rubyforge.org/frs/download.php/60718/rubygems-1.3.5.tgz",
+	    :configure => "",
+	    :make =>  "",
         :install => 'ruby setup.rb;'
       }
       

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(vim-full tree psmisc screen)
+          apps = %w(lsof vim-full tree psmisc screen)
           apt.install( {:base => apps}, :stable )
         end
 

data/lib/deprec/recipes/web/apache.rb

@@ -29,8 +29,18 @@ Capistrano::Configuration.instance(:must_exist).load do
         { :template => 'namevirtualhosts.conf',
           :path => '/etc/apache2/conf.d/namevirtualhosts.conf',
           :mode => 0644,
-          :owner => 'root:root'}
+          :owner => 'root:root'},
+          
+        # { :template => 'ports.conf.erb',
+        #   :path => '/etc/apache2/ports.conf',
+        #   :mode => 0644,
+        #   :owner => 'root:root'},
 
+        { :template => 'status.conf.erb',
+          :path => '/etc/apache2/mods-available/status.conf',
+          :mode => 0644,
+          :owner => 'root:root'}
+          
       ]
 
       PROJECT_CONFIG_FILES[:apache] = [
@@ -62,6 +72,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Push apache config files to server"
       task :config, :roles => :web do
         config_system
+        reload
       end
       
       desc "Generate initial configs and copy direct to server."

data/lib/deprec/recipes/xen.rb

@@ -205,6 +205,13 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 end
 
+# Add support for intrepid and jaunty guests to hardy host
+#
+# root@x1:/usr/share/debootstrap/scripts# ln -s gutsy jaunty
+# root@x1:/usr/share/debootstrap/scripts# ln -s gutsy intrepid
+#
+# root@x1:/usr/lib/xen-tools# ln -s edgy.d intrepid.d
+# root@x1:/usr/lib/xen-tools# ln -s edgy.d jaunty.d
 
 # Stop the 'incrementing ethX problem'
 #

data/lib/deprec/recipes_minus_rails.rb

@@ -20,7 +20,7 @@ require "#{File.dirname(__FILE__)}/recipes/web/apache"
 require "#{File.dirname(__FILE__)}/recipes/web/nginx"
 
 require "#{File.dirname(__FILE__)}/recipes/git"
-require "#{File.dirname(__FILE__)}/recipes/gitosis"
+# require "#{File.dirname(__FILE__)}/recipes/gitosis"
 require "#{File.dirname(__FILE__)}/recipes/svn"
 require "#{File.dirname(__FILE__)}/recipes/integrity"
 

data/lib/deprec/templates/apache/ports.conf.erb

@@ -0,0 +1,5 @@
+Listen 80
+
+<IfModule mod_ssl.c>
+    Listen 443
+</IfModule>

data/lib/deprec/templates/apache/status.conf.erb

@@ -0,0 +1,17 @@
+<IfModule mod_status.c>
+#
+# Allow server status reports generated by mod_status,
+# with the URL of http://servername/server-status
+# Uncomment and change the ".example.com" to allow
+# access from other hosts.
+#
+ExtendedStatus On
+<Location /server-status>
+    SetHandler server-status
+    Order deny,allow
+    Deny from all
+    Allow from localhost ip6-localhost
+#    Allow from .example.com
+</Location>
+
+</IfModule>

data/lib/deprec/templates/collectd/collectd-init.d

@@ -0,0 +1,153 @@
+#!/bin/bash
+#
+# collectd - start and stop the statistics collection daemon
+# http://collectd.org/
+#
+# Copyright (C) 2005-2006 Florian Forster <octo@verplant.org>
+# Copyright (C) 2006-2008 Sebastian Harl <sh@tokkee.org>
+#
+
+### BEGIN INIT INFO
+# Provides:          collectd
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      $network $named $syslog $time
+# Should-Stop:       $network $named $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: start the statistics collection daemon
+### END INIT INFO
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DISABLE=0
+
+DESC="statistics collection and monitoring daemon"
+NAME=collectd
+DAEMON=/usr/local/sbin/collectd
+
+CONFIGFILE=/usr/local/etc/collectd.conf
+PIDFILE=/usr/local/var/run/collectd.pid
+
+USE_COLLECTDMON=1
+COLLECTDMON_DAEMON=/usr/local/sbin/collectdmon
+COLLECTDMON_PIDFILE=/usr/local/var/run/collectdmon.pid
+
+MAXWAIT=30
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+if [ -r /etc/default/$NAME ]; then
+	. /etc/default/$NAME
+fi
+
+if test "$DISABLE" != 0; then
+	echo "$NAME has been disabled - see /etc/default/$NAME."
+	exit 0
+fi
+
+if test "$ENABLE_COREFILES" == 1; then
+	ulimit -c unlimited
+fi
+
+if test "$USE_COLLECTDMON" == 1; then
+	_PIDFILE="$COLLECTDMON_PIDFILE"
+else
+	_PIDFILE="$PIDFILE"
+fi
+
+d_start() {
+	if ! $DAEMON -t -C "$CONFIGFILE" > /dev/null 2>&1; then
+		$DAEMON -t -C "$CONFIGFILE"
+		exit 1
+	fi
+
+	if test "$USE_COLLECTDMON" == 1; then
+		start-stop-daemon --start --quiet --pidfile "$_PIDFILE" \
+			--exec $COLLECTDMON_DAEMON -- -P "$_PIDFILE" -- -C "$CONFIGFILE"
+	else
+		start-stop-daemon --start --quiet --pidfile "$_PIDFILE" \
+			--exec $DAEMON -- -C "$CONFIGFILE" -P "$_PIDFILE"
+	fi
+}
+
+still_running_warning="
+WARNING: $NAME might still be running.
+In large setups it might take some time to write all pending data to
+the disk. You can adjust the waiting time in /etc/default/collectd."
+
+d_stop() {
+	PID=$( cat "$_PIDFILE" 2> /dev/null ) || true
+
+	start-stop-daemon --stop --quiet --oknodo --pidfile "$_PIDFILE"
+
+	sleep 1
+	if test -n "$PID" && kill -0 $PID 2> /dev/null; then
+		i=0
+		while kill -0 $PID 2> /dev/null; do
+			i=$(( $i + 2 ))
+			echo -n " ."
+
+			if test $i -gt $MAXWAIT; then
+				echo "$still_running_warning" >&2
+				return 1
+			fi
+
+			sleep 2
+		done
+		return 0
+	fi
+}
+
+d_status() {
+	PID=$( cat "$_PIDFILE" 2> /dev/null ) || true
+
+	if test -n "$PID" && kill -0 $PID 2> /dev/null; then
+		echo "collectd ($PID) is running."
+		exit 0
+	else
+		PID=$( pidof collectd ) || true
+
+		if test -n "$PID"; then
+			echo "collectd ($PID) is running."
+			exit 0
+		else
+			echo "collectd is stopped."
+		fi
+	fi
+}
+
+case "$1" in
+	start)
+		echo -n "Starting $DESC: $NAME"
+		d_start
+		echo "."
+		;;
+	stop)
+		echo -n "Stopping $DESC: $NAME"
+		d_stop
+		echo "."
+		;;
+	status)
+		d_status
+		;;
+	restart|force-reload)
+		echo -n "Restarting $DESC: $NAME"
+		d_stop
+		sleep 1
+		d_start
+		echo "."
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+		exit 1
+		;;
+esac
+
+exit 0
+
+# vim: syntax=sh noexpandtab sw=4 ts=4 :
+

data/lib/deprec/templates/haproxy/haproxy-init.d

@@ -48,8 +48,9 @@ haproxy_stop()
 
 haproxy_reload()
 {
-	$HAPROXY -f "$CONFIG" -p $PIDFILE -D $EXTRAOPTS -st $(<$PIDFILE) \
-		|| return 2
+
+        # haproxy -f /etc/haproxy.conf -sf `cat /var/run/haproxy.pid`
+ 	$HAPROXY -f "$CONFIG" -sf `cat $PIDFILE` || return 2
 	return 0
 }
 

data/lib/deprec/templates/haproxy/haproxy.cfg.erb

@@ -1,8 +1,8 @@
 # /etc/haproxy.cfg
 #
-# Reload gracelly with:
+# Reload gracefully with:
 #
-# haproxy -f /etc/haproxy.conf -sf `cat /var/run/haproxy.pid`
+# haproxy -f /etc/haproxy.cfg -sf `cat /var/run/haproxy.pid`
 #
 global
       log /var/log/haproxy.log daemon info

data/lib/deprec/templates/nagios/objects/contacts.cfg.erb

@@ -65,14 +65,25 @@ define contactgroup{
 
 # Generic contact definition template - This is NOT a real contact, just a template!
 
-define contact{
-        name                            generic-contact    	; The name of this contact template
-        service_notification_period     24x7			; service notifications can be sent anytime
-        host_notification_period        24x7			; host notifications can be sent anytime
-        service_notification_options    w,u,c,r,f,s		; send notifications for all service states, flapping events, and scheduled downtime events
-        host_notification_options       d,u,r,f,s		; send notifications for all host states, flapping events, and scheduled downtime events
-        service_notification_commands   notify-service-by-email	; send service notifications via email
-        host_notification_commands      notify-host-by-email	; send host notifications via email
-        register                        0       		; DONT REGISTER THIS DEFINITION - ITS NOT A REAL CONTACT, JUST A TEMPLATE!
-        }
+define contact{ # example contact
+	name contact_template
+	# contact_name	name
+	# alias	longer_name
+	# contactgroups	contactgroup_names
+	host_notifications_enabled	0
+	service_notifications_enabled	0
+	host_notification_period	24x7
+	service_notification_period	24x7
+	host_notification_options	d,u,r,f,s
+	service_notification_options	w,u,c,r,f,s
+	host_notification_commands	notify-host-by-email
+	service_notification_commands	notify-service-by-email
+	# email	user@address.com
+	# pager	pager_number or pager_email_gateway
+	# addressx	additional_contact_address
+	# can_submit_commands	[0/1]
+	# retain_status_information	[0/1]
+	# retain_nonstatus_information	[0/1]
+	register 0
+}
 

data/lib/deprec/templates/nagios/objects/services.cfg.erb

@@ -79,19 +79,19 @@ define service{
 	check_command check_dns
 }
 
-define service {
-   use     				generic-service ; Name of service template to use
-   hostgroup_name  		mail
-   service_description  postfix smtp
-   check_command   		check_nrpe!check_postfix_satellite
-}
-
-define service{ 
-	use generic-service 
-	hostgroup_name mysql_servers
-	service_description Mysql 
-	check_command check_nrpe!check_mysql
-}
+# define service {
+#    use     				generic-service ; Name of service template to use
+#    hostgroup_name  		mail
+#    service_description  postfix smtp
+#    check_command   		check_nrpe!check_postfix_satellite
+# }
+# 
+# define service{ 
+# 	use generic-service 
+# 	hostgroup_name mysql_servers
+# 	service_description Mysql 
+# 	check_command check_nrpe!check_mysql
+# }
 
 # Check requests per second to Apache (via collectd)
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.1.4
 platform: ruby
 authors: 
 - Mike Bailey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 +10:00
+date: 2009-09-16 00:00:00 +10:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,10 +98,13 @@ files:
 - lib/deprec/templates/aoe/aoe-init
 - lib/deprec/templates/aoe/fence_aoemask
 - lib/deprec/templates/apache/namevirtualhosts.conf
+- lib/deprec/templates/apache/ports.conf.erb
+- lib/deprec/templates/apache/status.conf.erb
 - lib/deprec/templates/ar_sendmail/logrotate.conf.erb
 - lib/deprec/templates/ar_sendmail/monit.conf.erb
 - lib/deprec/templates/chef/chef.json.erb
 - lib/deprec/templates/chef/solo.rb
+- lib/deprec/templates/collectd/collectd-init.d
 - lib/deprec/templates/collectd/collectd.conf.erb
 - lib/deprec/templates/ddclient/ddclient.conf.erb
 - lib/deprec/templates/ddclient/ddclient.erb
@@ -232,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: deprec
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: deployment recipes for capistrano