capitate 0.2.7 → 0.2.8

data/Capfile

@@ -11,7 +11,3 @@ require 'lib/capitate/recipes'
 
 require 'erb'
 
-set :user, "root"
-
-# For testing
-load "lib/deployment/install-centos-rubyweb.rb"

data/History.txt

@@ -1,10 +1,17 @@
+== 0.2.8 2008-03-13
+
+* Recipe, mysql:centos:install, doing restart incase already run
+* Added sshd monit recipe. In case using non-standard sshd port
+* Updated example deployment install script (centos 5.1 x86_64)
+* Move monit inittab install at the end
+* Added fetch_any(:var1, :var2)
+
 == 0.2.7 2008-03-10
 
 * Add clean method to sphinx init script
 * Moved install and make_install into build plugin
 * Added symlink option to make_install
 * Added fetch_role and fetch_roles methods
-* Recipe fixes
 
 == 0.2.6 2008-02-29
 
@@ -76,4 +83,4 @@
 
 == 0.1.1 2008-02-06
 
-* Initial import
+* Initial import

data/Manifest.txt

@@ -8,39 +8,8 @@ bin/capitate
 config/hoe.rb
 config/requirements.rb
 docs/nginx.README
-docs/recipes/centos.txt
-docs/recipes/deploy-pending.txt
-docs/recipes/deploy-web.txt
-docs/recipes/deploy.txt
-docs/recipes/docs.txt
-docs/recipes/imagemagick-centos.txt
-docs/recipes/imagemagick.txt
-docs/recipes/index.txt
-docs/recipes/memcached-centos.txt
-docs/recipes/memcached-monit.txt
-docs/recipes/memcached.txt
-docs/recipes/mongrel-cluster-centos.txt
-docs/recipes/mongrel-cluster-monit.txt
-docs/recipes/mongrel-cluster.txt
-docs/recipes/mongrel.txt
-docs/recipes/monit-centos.txt
-docs/recipes/monit.txt
-docs/recipes/mysql-centos.txt
-docs/recipes/mysql-monit.txt
-docs/recipes/mysql.txt
-docs/recipes/nginx-centos.txt
-docs/recipes/nginx-mongrel.txt
-docs/recipes/nginx-monit.txt
-docs/recipes/nginx.txt
-docs/recipes/rails.txt
-docs/recipes/ruby-centos.txt
-docs/recipes/ruby.txt
-docs/recipes/sphinx-centos.txt
-docs/recipes/sphinx-monit.txt
-docs/recipes/sphinx.txt
 lib/capitate.rb
 lib/capitate/cap_ext/connections.rb
-lib/capitate/cap_ext/extension_proxy.rb
 lib/capitate/cap_ext/roles.rb
 lib/capitate/cap_ext/run_via.rb
 lib/capitate/cap_ext/variables.rb
@@ -56,8 +25,8 @@ lib/capitate/plugins/yum.rb
 lib/capitate/recipes.rb
 lib/capitate/task_node.rb
 lib/capitate/version.rb
+lib/deployment/centos-5.1-64-web/install.rb
 lib/deployment/deploy.rb
-lib/deployment/install-centos-rubyweb.rb
 lib/recipes/centos/centos.rb
 lib/recipes/centos/imagemagick.rb
 lib/recipes/centos/memcached.rb
@@ -75,6 +44,7 @@ lib/recipes/mysql.rb
 lib/recipes/nginx.rb
 lib/recipes/rails.rb
 lib/recipes/sphinx.rb
+lib/recipes/sshd.rb
 lib/templates/capistrano/Capfile
 lib/templates/memcached/memcached.initd.centos.erb
 lib/templates/memcached/memcached.monitrc.erb
@@ -97,6 +67,7 @@ lib/templates/ruby/fix_openssl.sh
 lib/templates/sphinx/sphinx.conf.erb
 lib/templates/sphinx/sphinx.monitrc.erb
 lib/templates/sphinx/sphinx_app.initd.centos.erb
+lib/templates/sshd/sshd.monitrc.erb
 script/destroy
 script/generate
 script/txt2html
@@ -107,6 +78,7 @@ tasks/website.rake
 test/test_helper.rb
 test/test_plugin_upload.rb
 test/test_recipes.rb
+test/test_roles.rb
 test/test_templates.rb
 website/index.html
 website/index.txt

data/README.txt

@@ -1 +1,8 @@
-See website/index.txt
+= Capitate
+
+http://capitate.rubyforge.org
+
+== DESCRIPTION 
+
+Recipes to make capistrano more useful.
+

data/lib/capitate/cap_ext/variables.rb

@@ -42,15 +42,38 @@ module Capitate
       #   # Any calls to fetch(memcached_port) in the future will return this value 11211 (unless overriden)
       #
       def fetch_or_default(variable, default, *args)
-        begin
-          return fetch(variable, *args)
-        rescue IndexError
+        if exists?(variable)
+          fetch(variable, *args)
+        else
           set variable, default
+          default
+        end        
+      end
+      
+      # Fetch or set and fetch any default variable listed.
+      #
+      # ==== Options
+      # +variable+:: Variable to fetch
+      # +variables+:: List if variables to try in order
+      #
+      # ==== Examples
+      #   fetch_or_set(:sphinx_db_host, :db_host)
+      #
+      def fetch_or_set(variable, *default_variables)
+        return fetch(variable) if exists?(variable)
+        
+        default_variables.each do |default_variable|
+          if exists?(default_variable)
+            value = fetch(default_variable) 
+            set variable, value
+            return value
+          end
         end
-        default
+        nil        
       end
       
       # Fetch roles with name and options
+      # I don't actually use this.
       #
       # ==== Options
       # +name+:: Role name to look for
@@ -86,7 +109,7 @@ module Capitate
         matched_roles.to_a
       end
       
-      # Fetch first role with name and options
+      # Fetch first role with name and options.
       #
       # ==== Options
       # +name+:: Role name to look for

data/lib/capitate/plugins/build.rb

@@ -24,7 +24,7 @@ module Capitate::Plugins::Build
       
       # Whether to capture build output
       unless options.has_key?(:to_log)
-        to_log = ">> debug.log"
+        to_log = ">> debug.log 2>&1"
       else
         to_log = ""
         to_log = ">> #{options[:to_log]}" unless options[:to_log].blank?

data/lib/capitate/version.rb

@@ -2,7 +2,7 @@ module Capitate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/deployment/{install-centos-rubyweb.rb → centos-5.1-64-web/install.rb}

@@ -1,24 +1,34 @@
-#
-# For installing apps on the thoughpolice centos 5.1 image
-#
+# Centos 5.1 base install
 
-task :check_role do
-  # Can use cap HOSTS=192.168.1.111 install
-  # Otherwise prompt for the service
-  role :install, prompt.ask("Server: ") if find_servers_for_task(current_task).blank?  
-end
+load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+
+require 'erb'
+
+# Load capitate
+require 'capitate'
+require 'capitate/recipes'
 
+# Load more recipes
+Dir[File.dirname(__FILE__) + "/recipes/*.rb"].each { |recipe| load recipe }
+
+# Add a templates dir
+set :templates_dirs, [ File.dirname(__FILE__) + "/templates" ]
+
+# Install task
 namespace :install do
 
   task :default do
   
-    # Add a templates dir
-    # set :templates_dirs, [ File.dirname(__FILE__) + "/../templates" ]
-  
-    set :user, "root"
-    set :run_method, :run
-  
+    as_root  
     check_role
+      
+    # NTP Setup    
+    yum.install([ "ntp" ])
+    script.run_all <<-CMDS
+      chkconfig --levels 235 ntpd on
+      ntpdate 0.pool.ntp.org
+      /sbin/service ntpd start
+    CMDS
   
     # Setup for web  
     # * Add admin group
@@ -26,41 +36,49 @@ namespace :install do
     # * Create web apps directory
     # * Add admin group to suders ALL=(ALL)   ALL
     script.run_all <<-CMDS  
-      egrep "^admin" /etc/group || /usr/sbin/groupadd admin 
-      sed -i -e 's/^id:5:initdefault:/id:3:initdefault:/g' /etc/inittab
+      egrep "^admin" /etc/group || /usr/sbin/groupadd admin
       mkdir -p /var/www/apps
       egrep "^%admin" /etc/sudoers || echo "%admin  ALL=(ALL)   ALL" >> /etc/sudoers
     CMDS
     
     # Package installs
-    yum.remove [ "openoffice.org-*", "ImageMagick" ]
-    #yum.update
+    yum.update
     yum.install [ "gcc", "kernel-devel", "libevent-devel", "libxml2-devel", "openssl", "openssl-devel",
        "aspell", "aspell-devel", "aspell-en", "aspell-es" ]
-  
+    
+    yum.clean
+      
     #
     # App installs
     #
-  
-    ruby.centos.install  
-  
+      
+    ruby.centos.install        
     nginx.centos.install
     mysql.centos.install
     sphinx.centos.install
+    
     monit.centos.install
+    # Install firewall rule manually
+    #monit.centos.iptables 
+    
+    sshd.monit.install
+    
     imagemagick.centos.install
     memcached.centos.install
-  
+      
     #
     # Install monit hooks
     #
     nginx.monit.install
     mysql.monit.install
     memcached.monit.install
-  
+      
     # Install gems
     gems.install(fetch(:gems_to_install))
     
+    # Install renderer
+    renderer.install
+  
     # Cleanup
     yum.clean
   end
@@ -77,11 +95,17 @@ end
 desc "Be root"
 task :as_root do
   set :user, "root"
+  set :run_method, :run
 end
 
-#
-# Fixes
-#
+# Prompt for server if host not given
+task :check_role do
+  # Can use cap HOSTS=192.168.1.111 install
+  # Otherwise prompt for the service
+  role :install, prompt.ask("Server: ") if find_servers_for_task(current_task).blank?  
+end
+
+# For for ruby install
 after "ruby:centos:install" do
   # Fix ruby install openssl
   script.sh("ruby/fix_openssl.sh")
@@ -93,7 +117,7 @@ end
 #
 
 set :gems_to_install, [ "rake", "mysql -- --with-mysql-include=/usr/include/mysql --with-mysql-lib=/usr/lib/mysql --with-mysql-config", 
-  "raspell", "rmagick", "mongrel", "mongrel_cluster", "json", "mime-types" ]
+  "raspell", "rmagick", "mongrel", "mongrel_cluster", "json", "mime-types", "hpricot" ]
 
 
 # Ruby install
@@ -141,21 +165,25 @@ set :nginx_build_options, {
 # Sphinx install 
 set :sphinx_prefix, "/usr/local/sphinx-0.9.8-rc1"
 set :sphinx_build_options, {
-  :url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.8-rc1.tar.gz",
-  #:url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.7.tar.gz",
-  :configure_options => "--with-mysql-includes=/usr/include/mysql --with-mysql-libs=/usr/lib/mysql \
---prefix=#{sphinx_prefix}",
+  :url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.8-rc1.tar.gz",  
+  :configure_options => "--with-mysql-includes=/usr/include/mysql --with-mysql-libs=/usr/lib64/mysql --prefix=#{sphinx_prefix}",
   :symlink => { sphinx_prefix => "/usr/local/sphinx" }
 }
-
+# Other possible sphinx_build_options
+# :url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.7.tar.gz",
+# :configure_options => "--with-mysql-includes=/usr/include/mysql --with-mysql-libs=/usr/lib/mysql --prefix=#{sphinx_prefix}",
 
 
 # For mysql:install
 set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"
-set :db_port, 3306
+set :mysql_port, 3306
 
 # Imagemagick install
 set :imagemagick_build_options, {
   :url => "http://capitate.s3.amazonaws.com/ImageMagick.tar.gz",
   :unpack_dir => "ImageMagick-*"
 }
+
+# For sshd:monit:install
+set :sshd_pid_path, "/var/run/mysqld/mysqld.pid"
+set :sshd_port, 2023

data/lib/deployment/deploy.rb

@@ -1,6 +1,4 @@
-#
-# Settings for project
-#
+# Example deploy.rb
 
 set :application, "sick"
 set :user, "sick"

data/lib/recipes/centos/monit.rb

@@ -39,12 +39,12 @@ namespace :monit do
       put template.load("monit/monitrc.erb"), "/tmp/monitrc"
       run_via "mkdir -p #{monit_conf_dir} && install -o root -m 700 /tmp/monitrc /etc/monitrc && rm -f /tmp/monitrc"
 
-      # Patch initab
-      script.sh("monit/patch_inittab.sh")
-
       # Build cert
       put template.load("monit/monit.cnf"), "/tmp/monit.cnf"
       script.sh("monit/cert.sh")
+      
+      # Patch initab
+      script.sh("monit/patch_inittab.sh")      
     end
     
     desc <<-DESC

data/lib/recipes/centos/mysql.rb

@@ -18,7 +18,7 @@ namespace :mysql do
 
       # Install service
       run_via "/sbin/chkconfig --level 345 mysqld on"
-      run_via "/sbin/service mysqld start"
+      run_via "/sbin/service mysqld restart"
       
       # Set admin password
       run_via "/usr/bin/mysqladmin -u root password #{mysql_admin_password_set}"    

data/lib/recipes/centos/ruby.rb

@@ -30,7 +30,7 @@ namespace :ruby do
     
       # Install rubygems
       build.install("rubygems", rubygems_build_options) do |dir|
-        run_via "cd #{dir} && ruby setup.rb > install.log", { :shell => true }
+        run_via "cd #{dir} && ruby setup.rb"
       end
     
     end        

data/lib/recipes/mysql.rb

@@ -6,7 +6,7 @@ namespace :mysql do
     desc <<-DESC
     Install mysql monit hooks.
   
-    *db_port*: Mysql port. _Defaults to 3306_\n
+    *mysql_port*: Mysql port. _Defaults to 3306_\n
     *mysql_pid_path*: Path to mysql pid file. _Defaults to /var/run/mysqld/mysqld.pid_\n
     @set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"@\n
     *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
@@ -16,7 +16,7 @@ namespace :mysql do
     
       # Settings 
       fetch_or_default(:mysql_pid_path, "/var/run/mysqld/mysqld.pid")
-      fetch_or_default(:db_port, 3306)   
+      fetch_or_default(:mysql_port, 3306)   
       fetch_or_default(:monit_conf_dir, "/etc/monit") 
     
       put template.load("mysql/mysql.monitrc.erb", binding), "/tmp/mysql.monitrc"    

data/lib/recipes/sphinx.rb

@@ -50,11 +50,11 @@ namespace :sphinx do
     fetch_or_default(:sphinx_log_root, "#{shared_path}/log")
     fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid")    
     
-    fetch_or_default(:sphinx_db_user, db_user)
-    fetch_or_default(:sphinx_db_pass, db_pass)
-    fetch_or_default(:sphinx_db_name, db_name)
-    fetch_or_default(:sphinx_db_port, db_port)
-    fetch_or_default(:sphinx_db_host, db_host)
+    fetch_or_set(:sphinx_db_user, :db_user)
+    fetch_or_set(:sphinx_db_pass, :db_pass)
+    fetch_or_set(:sphinx_db_name, :db_name)
+    fetch_or_set(:sphinx_db_port, :db_port)
+    fetch_or_set(:sphinx_db_host, :db_host)
     fetch_or_default(:sphinx_conf_host, "127.0.0.1")
         
     put template.load(sphinx_conf_template), sphinx_conf_path

data/lib/recipes/sshd.rb

@@ -0,0 +1,25 @@
+namespace :sshd do
+  
+  namespace :monit do
+    
+    desc <<-DESC
+    Install sshd monit hooks.
+  
+    *sshd_port*: SSH daemon port. _Defaults to 22\n
+    *sshd_pid_path*: Path to mysql pid file. _Defaults to /var/run/sshd.pid_\n
+    *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
+    DESC
+    task :install do
+    
+      # Settings 
+      fetch_or_default(:sshd_port, 3306)   
+      fetch_or_default(:sshd_pid_path, "/var/run/sshd.pid")      
+      fetch_or_default(:monit_conf_dir, "/etc/monit") 
+    
+      put template.load("sshd/sshd.monitrc.erb", binding), "/tmp/sshd.monitrc"    
+      run_via "install -o root /tmp/sshd.monitrc #{monit_conf_dir}/sshd.monitrc"
+    end
+    
+  end
+  
+end

data/lib/templates/monit/monitrc.erb

@@ -12,16 +12,6 @@ set httpd port <%= monit_port %>
   pemfile /var/certs/monit.pem
   allow admin:<%= monit_password %>
 
-# Core processes
-# ---------------------------
-
-check process sshd with pidfile /var/run/sshd.pid
-  start program  "/sbin/service sshd start"
-  stop program  "/sbin/service sshd stop"
-  if failed port 22 protocol ssh then restart
-  if 5 restarts within 5 cycles then timeout
-  
-  
 # Includes
 # ---------------------------
 

data/lib/templates/nginx/nginx.conf.erb

@@ -66,6 +66,7 @@ http {
   # GZip fails on pre SP2 IE6 browsers (even though is says it can)
   # Thanks, http://robsanheim.com/2008/02/07/beware-the-default-nginx-config-old-ie6-hates-gzip/
   # TODO: This doesn't work with our version of nginx
+  #gzip_disable "MSIE [1-6]\.(?!.*SV1)";
   #gzip_disable "MSIE [1-6]\.";
   
   # Auto include

data/lib/templates/sshd/sshd.monitrc.erb

@@ -0,0 +1,5 @@
+check process sshd with pidfile <%= sshd_pid_path %>
+  start program  "/sbin/service sshd start"
+  stop program  "/sbin/service sshd stop"
+  if failed port <%= sshd_port %> protocol ssh then restart
+  if 5 restarts within 5 cycles then timeout

data/website/index.html

@@ -38,14 +38,14 @@
 
     <div id="version" class="clickable box" onclick='document.location = "http://rubyforge.org/projects/capitate"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.7</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.8</a>
     </div>
     
     <div id="recipes">
       <p>Documentation:
       <a href="recipes/index.html">Recipes</a> &#x2192;
-      <a href="http://svn.ducktyper.com/capitate/trunk/lib/capitate/plugins/">Plugins</a> &#x2192;
-      <a href="http://svn.ducktyper.com/capitate/trunk/lib/templates/">Templates</a>
+      <a href="http://github.com/gabriel/capitate/tree/master/lib/capitate/plugins">Plugins</a> &#x2192;
+      <a href="http://github.com/gabriel/capitate/tree/master/lib/templates">Templates</a>
       </p>
     </div>
 
@@ -81,7 +81,8 @@
 
 	<ul>
 	<li>Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, run shell scripts, etc.</li>
-		<li>Templates for init scripts, application configuration, etc.</li>
+		<li>Templates for init scripts and application configuration</li>
+		<li>Templates and recipes for common apps like monit, nginx, sphinx, mongrel, ruby and mysql</li>
 		<li>Common deployment setup and update_code tasks, such as symlinking in database.yml and more advanced recipes such as sphinx configuration.</li>
 	</ul>
 
@@ -89,13 +90,13 @@
 	<h3>Example: Using capitate to write an install task:</h3>
 
 
-	<p>See <a href="http://svn.ducktyper.com/capitate/trunk/lib/deployment/install-centos-rubyweb.rb">install-centos-rubyweb.rb</a></p>
+	<p>See <a href="http://github.com/gabriel/capitate/tree/master/lib/deployment/centos-5.1-64-web/install.rb">centos-5.1-64-web/install.rb</a></p>
 
 
 	<p>Load this in your Capfile:</p>
 
 
-	<pre><code>load "lib/deployment/install-centos-rubyweb.rb"</code></pre>
+	<pre><code>load "lib/deployment/centos-5.1-64-web/install.rb"</code></pre>
 
 
 	<p>and then:</p>
@@ -122,7 +123,7 @@
 	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
 
 
-	<p>The trunk repository is <a href="http://svn.ducktyper.com/capitate/trunk">http://svn.ducktyper.com/capitate/trunk</a> for anonymous access.</p>
+	<p>The trunk repository is <a href="http://github.com/gabriel/capitate/tree/master">http://github.com/gabriel/capitate/tree/master</a> for anonymous access.</p>
 
 
 	<h2>License</h2>
@@ -137,7 +138,7 @@
 	<p>Comments are welcome. Send an email to <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a> via the <a href="http://groups.google.com/group/capitate">forum</a></p>
     </div>
     <p class="coda">
-      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, 10th March 2008<br>
+      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, 13th March 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -24,17 +24,18 @@ h2. The basics
 Capitate has:
 
 * Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, run shell scripts, etc.
-* Templates for init scripts, application configuration, etc.
+* Templates for init scripts and application configuration
+* Templates and recipes for common apps like monit, nginx, sphinx, mongrel, ruby and mysql
 * Common deployment setup and update_code tasks, such as symlinking in database.yml and more advanced recipes such as sphinx configuration.
 
 
 h3. Example: Using capitate to write an install task:
 
-See "install-centos-rubyweb.rb":http://svn.ducktyper.com/capitate/trunk/lib/deployment/install-centos-rubyweb.rb
+See "centos-5.1-64-web/install.rb":http://github.com/gabriel/capitate/tree/master/lib/deployment/centos-5.1-64-web/install.rb
 
 Load this in your Capfile:
 
-  load "lib/deployment/install-centos-rubyweb.rb"
+  load "lib/deployment/centos-5.1-64-web/install.rb"
   
 and then:
 
@@ -56,7 +57,7 @@ h2. How to submit patches
 
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
 
-The trunk repository is "http://svn.ducktyper.com/capitate/trunk":http://svn.ducktyper.com/capitate/trunk for anonymous access.
+The trunk repository is "http://github.com/gabriel/capitate/tree/master":http://github.com/gabriel/capitate/tree/master for anonymous access.
 
 h2. License
 

data/website/template.rhtml

@@ -44,8 +44,8 @@
     <div id="recipes">
       <p>Documentation:
       <a href="recipes/index.html">Recipes</a> &#x2192;
-      <a href="http://svn.ducktyper.com/capitate/trunk/lib/capitate/plugins/">Plugins</a> &#x2192;
-      <a href="http://svn.ducktyper.com/capitate/trunk/lib/templates/">Templates</a>
+      <a href="http://github.com/gabriel/capitate/tree/master/lib/capitate/plugins">Plugins</a> &#x2192;
+      <a href="http://github.com/gabriel/capitate/tree/master/lib/templates">Templates</a>
       </p>
     </div>