winton-cookbook 1.0.3 → 1.1.0

data/README.markdown

@@ -76,9 +76,11 @@ Set up your fresh Debian server
 
 ### On your machine
 
-	cap debian:setup
+You may want to run the commands in **[debian:aptitude](http://github.com/winton/cookbook/tree/master/lib/recipes/debian.rb)** from the remote shell if it is your first time doing so.
 	
-(See **config/cookbook/recipes/debian.rb**. You might want to run the tasks individually to know what's going on.)
+	cap debian:aptitude
+	cap debian:config
+	cap debian:install
 	
 ### On the server
 

data/deploy.rb.example

@@ -2,7 +2,7 @@ set :cookbook, {
   :application  => 'my_app',
   :base_dir     => '/var/www',
   :repository   => 'git@github.com:user/my-app.git',
- #:platform     => :php       # If enabled, you can remove all mongrel* lines
+ #:platform     => :php,      # If enabled, you can remove all mongrel* lines
   :mongrel_port => 3000,      # Your next app should be 3003
   :ssh_port     => 22,        # Or any unused port above 1024 (best practice)
   
@@ -31,15 +31,18 @@ set :cookbook, {
   },
   
   :sources => {
-    :git          => 'http://kernel.org/pub/software/scm/git/git-1.5.5.3.tar.gz',
-    :lighttpd     => 'http://www.lighttpd.net/download/lighttpd-1.4.19.tar.gz',
-    :nginx        => 'http://sysoev.ru/nginx/nginx-0.6.31.tar.gz',
-    :ruby         => 'ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p114.tar.gz',
-    :rubygems     => 'http://rubyforge.org/frs/download.php/35283/rubygems-1.1.1.tgz',
-    :sphinx       => 'http://www.sphinxsearch.com/downloads/sphinx-0.9.8-rc2.tar.gz'
+    :git           => 'http://kernel.org/pub/software/scm/git/git-1.6.0.1.tar.gz',
+    :lighttpd      => 'http://www.lighttpd.net/download/lighttpd-1.4.19.tar.gz',
+    :nginx         => 'http://sysoev.ru/nginx/nginx-0.6.32.tar.gz',
+    :mysecureshell => 'http://internap.dl.sourceforge.net/sourceforge/mysecureshell/MySecureShell-1.0_source.tgz',
+    :ruby          => 'ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.gz',
+    :rubygems      => 'http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz',
+    :sphinx        => 'http://www.sphinxsearch.com/downloads/sphinx-0.9.8.tar.gz'
   }
 }
 
-# See config/cookbook/cookbook.rb for more cookbook options
+# If installed from gem
+require 'cookbook'
 
-require 'config/cookbook/cookbook'
+# If installed from plugin
+# require 'vendor/plugins/cookbook/lib/cookbook'

data/lib/cookbook.rb

@@ -30,7 +30,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   set :auth_user,           fetch(:auth_user,           false)
   set :nginx_dir,           fetch(:nginx_dir,           '/usr/local/nginx/conf')
   set :mysql_dir,           fetch(:mysql_dir,           '/etc/mysql')
+  set :app_helpers,         fetch(:app_helpers,         false)
   set :ultrasphinx,         fetch(:ultrasphinx,         false)
+  set :thinking_sphinx,     fetch(:thinking_sphinx,     false)
   set :attachment_fu,       fetch(:attachment_fu,       false)
   set :asset_packager,      fetch(:asset_packager,      false)
   set :mongrel_etc_dir,     fetch(:mongrel_etc_dir,     '/usr/local/etc/mongrel_cluster')
@@ -50,8 +52,11 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   on :before, 'setup_stage', :except => [ :staging, :testing ]  # Executed before every task
   if platform == :rails
-    after 'deploy:update_code', 'rails:setup_git'               # Initialize submodules
+    #after 'deploy:update_code', 'rails:setup_git'               # Initialize submodules
     after 'deploy:update_code', 'rails:config:to_app'           # Copy shared config to app
+    if app_helpers
+      after 'deploy:update_code', 'rails:config:app_helpers'    # Set up app with app_helpers
+    end
     if asset_packager
       after 'deploy:update_code', 'rails:config:asset_packager' # Configure attachment_fu
     end
@@ -61,6 +66,9 @@ Capistrano::Configuration.instance(:must_exist).load do
     if ultrasphinx
       after 'deploy:update_code', 'rails:config:ultrasphinx'    # Configure ultrasphinx
     end
+    if thinking_sphinx
+      after 'deploy:update_code', 'rails:config:thinking_sphinx'    # Configure thinking_sphinx
+    end
   end
   
 end

data/lib/cookbook_helpers.rb

@@ -4,7 +4,7 @@ require 'erb'
 # Install
 
 def gem_install(name, options='')
-  sudo_puts "gem install #{name} #{options}"
+  sudo_puts "gem install #{name} #{options} --no-rdoc --no-ri -q"
 end
 
 def unpack_source(source)

data/lib/recipes/debian.rb

@@ -104,6 +104,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :default do
         debian.install.git
         debian.install.lighttpd
+        debian.install.mysecureshell
         debian.install.mysql
         debian.install.nginx
         debian.install.php
@@ -118,7 +119,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         install_source(:git) do |path|
           sudo_puts [
             "aptitude install tcl8.4 tk8.4 gettext -q -y",
-            "cd #{path} && ./configure && make && sudo make install"
+            ";cd #{path} && ./configure && make && sudo make install"
           ]
         end
       end
@@ -127,27 +128,36 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :lighttpd, :roles => :app do
         sudo_puts 'aptitude install libpcre3-dev libbz2-dev -q -y'
         install_source(:lighttpd) do |path|
-          sudo_puts "cd #{path} && ./configure && make && sudo make install"
+          sudo_puts ";cd #{path} && ./configure && make && sudo make install"
         end
       end
       
       desc 'Install Monit'
       task :monit, :roles => :db do
         sudo_puts 'aptitude install monit -q -y'
-        monit.config.default
+        ROOT.monit.config.default
+      end
+      
+      desc "Install MySecureShell"
+      task :mysecureshell, :roles => :app do
+        # http://www.howtoforge.com/mysecureshell_sftp_debian_etch
+        sudo_puts 'aptitude install libssl0.9.7 ssh openssh-server -q -y'
+        install_source(:mysecureshell) do |path|
+          sudo_puts ";cd ~/sources/mysecureshell* && ./configure && make && sudo make install"
+        end
       end
       
       desc 'Install MySQL'
       task :mysql, :roles => :db do
         sudo_puts 'aptitude install mysql-server mysql-client libmysqlclient15-dev libmysql-ruby -q -y'
         ROOT.mysql.config
+        ROOT.mysql.create.user
         puts [
           '',
           "It is highly recommended you run mysql_secure_installation manually.",
           "See http://dev.mysql.com/doc/refman/5.1/en/mysql-secure-installation.html",
           ''
         ].join("\n")
-        ROOT.mysql.create.user
       end
       
       desc 'Install Nginx'
@@ -155,7 +165,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         # apache2-utils for htpasswd, rest for nginx build
         sudo_puts 'aptitude install apache2-utils libpcre3 libpcre3-dev libpcrecpp0 libssl-dev zlib1g-dev -q -y'
         install_source(:nginx) do |path|
-          sudo_puts "cd #{path} && ./configure --sbin-path=/usr/local/sbin --with-http_ssl_module && make && sudo make install"
+          sudo_puts ";cd #{path} && ./configure --sbin-path=/usr/local/sbin --with-http_ssl_module && make && sudo make install"
         end
         upload_from_erb '/etc/init.d/nginx', binding, :chown => 'root', :chmod => '+x', :folder => 'nginx'
         sudo '/usr/sbin/update-rc.d -f nginx defaults'
@@ -164,7 +174,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Install PHP"
       task :php, :roles => :app do
-        sudo_puts 'aptitude install php5-cli php5-cgi php5-mysql php5-xcache -q -y'
+        sudo_puts 'aptitude install php5-cli php5-cgi php5-mysql php5-xcache php-pear php-mail php-net-smtp -q -y'
         upload_from_erb [
           '/usr/local/bin/php-fastcgi',
           '/etc/init.d/init-fastcgi'
@@ -175,14 +185,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc 'Install Ruby'
       task :ruby, :roles => :app do
         install_source(:ruby) do |path|
-          sudo_puts "cd #{path} && ./configure && make && sudo make install"
+          sudo_puts ";cd #{path} && ./configure && make && sudo make install"
         end
       end
       
       desc 'Install RubyGems'
       task :rubygems, :roles => :app do
         install_source(:rubygems) do |path|
-          sudo_puts "cd #{path} && ruby setup.rb"
+          run_puts "cd #{path} && sudo ruby setup.rb"
         end
         gems.update
         gems.install
@@ -191,7 +201,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc 'Install Sphinx'
       task :sphinx, :roles => :app do
         install_source(:sphinx) do |path|
-          sudo_puts "cd #{path} && ./configure && make && sudo make install"
+          sudo_puts ";cd #{path} && ./configure && make && sudo make install"
         end
       end
     end

data/lib/recipes/gems.rb

@@ -22,6 +22,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         gems.install.mime_types
         gems.install.mongrel
         gems.install.rails
+        gems.install.redcloth
       end
       
       desc 'Install Chronic'
@@ -58,13 +59,18 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :mongrel, :roles => :app do
         gem_install :mongrel
         gem_install :mongrel_cluster
-        mongrel.config.survive_reboot
+        ROOT.mongrel.config.survive_reboot
       end
       
       desc 'Install Rails'
       task :rails, :roles => :app do
         gem_install :rails
       end
+      
+      desc 'Install RedCloth'
+      task :redcloth, :roles => :app do
+        gem_install 'RedCloth'
+      end
     end
   
     desc "Uninstall a remote gem"

data/lib/recipes/rails.rb

@@ -5,7 +5,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Copies all files in cookbook/rails to shared config"
       task :default, :roles => :app do
         run "mkdir -p #{shared_path}/config"
-        Dir[File.expand_path('../config/rails/*', File.dirname(__FILE__))].each do |f|
+        Dir[File.expand_path('../templates/rails/*', File.dirname(__FILE__))].each do |f|
           upload_from_erb "#{shared_path}/config/#{File.basename(f, '.erb')}", binding, :folder => 'rails'
         end
       end
@@ -15,6 +15,12 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cp -Rf #{shared_path}/config/* #{release_path}/config"
       end
       
+      desc "Set up app with app_helpers" 
+      task :app_helpers do
+        run "cd #{release_path} && script/plugin install git://github.com/winton/app_helpers.git"
+        run "cd #{release_path} && rake RAILS_ENV=production quiet=true app_helpers"
+      end
+      
       desc "Configure asset_packager" 
       task :asset_packager do
         run "source ~/.bash_profile && cd #{release_path} && rake RAILS_ENV=production asset:packager:build_all"
@@ -32,20 +38,43 @@ Capistrano::Configuration.instance(:must_exist).load do
         ]
       end
       
+      namespace :thinking_sphinx do
+        desc "Configures thinking_sphinx"
+        task :default, :roles => :app do
+          sudo ";cd #{release_path} && rake RAILS_ENV=production ts:config"
+        end
+        
+        desc "Stop thinking_sphinx"
+        task :stop, :roles => :app do
+          sudo ";cd #{release_path} && rake RAILS_ENV=production ts:stop"
+        end
+        
+        desc "Start thinking_sphinx"
+        task :start, :roles => :app do
+          sudo ";cd #{release_path} && rake RAILS_ENV=production ts:start"
+        end
+        
+        desc "Restart thinking_sphinx"
+        task :restart, :roles => :app do
+          rails.config.thinking_sphinx.stop
+          rails.config.thinking_sphinx.start
+        end
+      end
+      
       namespace :ultrasphinx do
         desc "Configures ultrasphinx"
         task :default, :roles => :app do
-          sudo "cd #{release_path} && rake RAILS_ENV=production ultrasphinx:configure"
+          sudo ";cd #{release_path} && rake RAILS_ENV=production ultrasphinx:configure"
         end
         
         desc "Stop ultrasphinx"
         task :stop, :roles => :app do
-          sudo "cd #{release_path} && rake RAILS_ENV=production ultrasphinx:daemon:stop"
+          sudo ";cd #{release_path} && rake RAILS_ENV=production ultrasphinx:daemon:stop"
         end
         
         desc "Start ultrasphinx"
         task :start, :roles => :app do
-          sudo "cd #{release_path} && rake RAILS_ENV=production ultrasphinx:daemon:start"
+          sudo ";cd #{release_path} && rake RAILS_ENV=production ultrasphinx:daemon:start"
         end
         
         desc "Restart ultrasphinx"

data/lib/recipes/ssh.rb

@@ -45,13 +45,13 @@ Capistrano::Configuration.instance(:must_exist).load do
         usr  = ask "Upload ssh public keys to which user? (default: #{user})", user
         keys = ask "Press enter to copy all public keys (~/.ssh/*.pub), or paste a key: ", get_ssh_keys
       
-        if k.empty?
+        if keys.empty?
           ssh.setup if yes("No keys found. Generate ssh keys now?")
         else
           sudo_each [
-            "mkdir /home/#{usr}/.ssh",
+            "mkdir -p /home/#{usr}/.ssh",
             "touch /home/#{usr}/.ssh/authorized_keys",
-            "echo \"#{keys}\" >> /home/#{usr}/.ssh/authorized_keys",
+            "echo \"#{keys.strip}\" | sudo tee /home/#{usr}/.ssh/authorized_keys",
             "chmod 0700 /home/#{usr}/.ssh",
             "chmod 0600 /home/#{usr}/.ssh/authorized_keys",
             "chown -R #{usr} /home/#{usr}/.ssh",

data/lib/templates/debian/bash_profile.erb

@@ -1,4 +1,4 @@
-export PS1='\e[01;30m\h \e[33m\u \e[01;34m\w\e[00m: '
+export PS1='\e[01;31m\h \e[01;32m\u \e[00;33m\w\e[00m: '
 
 alias free="free -m"
 

data/lib/templates/monit/mongrel.erb

@@ -1,8 +1,8 @@
 <% mongrels.times do |x| %>
 check process mongrel_<%= application %>_<%= mongrel_port + x %> with pidfile <%= deploy_to %>/shared/pids/mongrel.<%= mongrel_port + x %>.pid
   group mongrel
-  start program = "mongrel_rails cluster::start -C <%= "#{mongrel_etc_dir}/#{application}_#{stage}.yml" %> --clean --only <%= mongrel_port + x %>"
-  stop program  = "mongrel_rails cluster::stop -C <%= "#{mongrel_etc_dir}/#{application}_#{stage}.yml" %> --clean --only <%= mongrel_port + x %>"
+  start program = "/usr/local/bin/mongrel_rails cluster::start -C <%= "#{mongrel_etc_dir}/#{application}_#{stage}.yml" %> --clean --only <%= mongrel_port + x %>"
+  stop program  = "/usr/local/bin/mongrel_rails cluster::stop -C <%= "#{mongrel_etc_dir}/#{application}_#{stage}.yml" %> --clean --only <%= mongrel_port + x %>"
   if failed host 127.0.0.1 port <%= mongrel_port + x %> protocol http with timeout 10 seconds then restart
   if totalmem is greater than 110.0 MB for 4 cycles then restart      # eating up memory?
   if cpu is greater than 50% for 2 cycles then alert                  # send an email to admin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-cookbook
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Winton Welsh