deprec 1.7.1 → 1.8.0

data/docs/README.quickstart

@@ -0,0 +1,47 @@
+== deprec quickstart (with svn, trac and deployment to apache/mongrel/mysql)
+
+Here are instructions that will take a fresh install of Ubuntu Dapper (6.06.1 server), create a working rails app, create an SVN repository and trac installation for it and deploy it using apache, mongrel and mysql.
+
+All commands below are run on your local host. You will *never* be requested 
+to log into the remote server manually. Capistrano does all the work.
+
+- Mike
+
+
+# Install deprec on workstation
+sudo gem install deprec --include-dependencies
+echo 'require "deprec/recipes"'               >> ~/.caprc
+echo 'ssh_options[:keys] = %w(~/.ssh/id_dsa)' >> ~/.caprc
+echo 'ssh_options[:paranoid] = false'         >> ~/.caprc
+echo 'ssh_options[:forward_agent] = true'     >> ~/.caprc
+
+# Create rails project on workstation and configure for deprec
+# (alternatively use an existing project)
+rails example
+cd example
+./script/generate scaffold_resource person name:string age:integer
+deprec --apply-to . --name example --domain www.example.com
+
+# NOTE! Use following two commands if you only have 'root' account on server
+# Some VPS services provide you with this when you sign up
+cap change_root_password_as_root # '_as_root' means run this as 'root' user
+cap setup_admin_account_as_root 
+
+# Copy your ssh keys to remote server to avoid having to type passwords
+cap setup_ssh_keys
+
+# Install all required software on remote server
+cap install_rails_stack svn_install trac_install
+
+# Import application into subversion respository and setup trac
+cap svn_setup
+cap trac_setup
+cap trac_user_add # this command allows you to create other trac users
+cap trac_start # trac is now available on http://www.example.com:9000/
+cap trac_stop  # if you had the need
+
+# Deploy application
+cap setup
+cap deploy_with_migrations
+cap apache_restart 
+# application is now running on http://www.example.com/people

data/docs/README.slicehost

@@ -1,19 +1,14 @@
-== Slicehost extras
+== Slicehost specific notes for deprec
 
-# A freshly built slice gives you the root account
-# This creates a user account with sudo access
-# The '_as_root' means 'log in as root to do this'
-#
-export HOSTS=deptest.deprecated.org
-cap setup_admin_account_as_root # XXX echo new username
-cap setup_ssh_keys  # XXX do for others also
-cap install_rails_stack
-cap install_php
-cap setup
-cap deploy_with_migrations
-cap restart_apache
+# Slicehost provides you with root login and password for your slice.
 
-# svn+trac
-cap install_svn
-cap svn_setup_repos
+# Change the root password!
+cap change_root_password_as_root # '_as_root' means run this as 'root' user
 
+# Create an account with sudo access
+cap setup_admin_account_as_root 
+
+# Copy your ssh keys to remote server to avoid having to type passwords
+cap setup_ssh_keys
+
+now read README.quickstart

data/docs/README.svn_trac

@@ -0,0 +1,19 @@
+== svn and trac
+
+Installs subversion and trac software on server.
+Creates subversion repository on server and imports project.
+Sets up trac installation for project.
+
+role :scm, 'deptest.deprecated.org' 
+
+# install packages
+cap apache_install svn_install trac_install
+
+# import project
+cap svn_import_project
+cap trac_init
+cap trac_start
+
+# your project will be viewable at http://yourdomain:8000/
+# you can add other users with 'cap trac_user_add'
+

data/lib/deprec/capistrano_extensions/cli_extensions.rb

@@ -0,0 +1,35 @@
+module Capistrano
+  # The CLI class encapsulates the behavior of capistrano when it is invoked
+  # as a command-line utility. This allows other programs to embed ST and
+  # preserve it's command-line semantics.
+  class CLI
+    
+    # Prompt for a password using echo suppression.
+    def self.password_prompt(prompt="Password: ")
+      sync = STDOUT.sync
+      begin
+        with_echo do
+          STDOUT.sync = true
+          print(prompt)
+          STDIN.gets.chomp
+        end
+      ensure
+        STDOUT.sync = sync
+        puts
+      end
+    end
+    
+    def self.prompt(prompt="Password: ")
+      sync = STDOUT.sync
+      begin
+          STDOUT.sync = true
+          print(prompt)
+          STDIN.gets.chomp
+      ensure
+        STDOUT.sync = sync
+        puts
+      end
+    end
+    
+  end
+end

data/lib/deprec/capistrano_extensions/deprec_extensions.rb

@@ -2,10 +2,10 @@
 require 'capistrano'
 
 module Deprec
-  DEPREC_TEMPLATES_BASE = File.join(File.dirname(__FILE__), '..', 'recipes', 'templates')
+  DEPREC_TEMPLATES_BASE = File.join(File.dirname(__FILE__), '..', 'templates')
 
   def render_template_to_file(template_name, destination_file_name, templates_dir = DEPREC_TEMPLATES_BASE)
-    template_name += '.conf' if File.extname(template_name) == ''
+    template_name += '.conf' if File.extname(template_name) == '' # XXX this to be removed
     
     file = File.join(templates_dir, template_name)
     buffer = render :template => File.read(file)
@@ -21,7 +21,7 @@ module Deprec
     # XXX if options[:requires_sudo] and :use_sudo then use sudo
     sudo <<-END
     sh -c '
-      grep "#{value}" #{filename} > /dev/null 2>&1 || 
+      grep -F "#{value}" #{filename} > /dev/null 2>&1 || 
       test ! -f #{filename} ||
       echo "#{value}" >> #{filename}
       '

data/lib/deprec/generators/deprec/templates/deploy.rb

@@ -13,6 +13,7 @@ set :domain, "<%= domain_name %>"
 role :web, domain
 role :app, domain
 role :db,  domain, :primary => true
+role :scm, domain
 
 # =============================================================================
 # REQUIRED VARIABLES

data/lib/deprec/recipes.rb

@@ -1,15 +1,19 @@
 require 'deprec/recipes/ssh'
 require 'deprec/recipes/svn'
+require 'deprec/recipes/trac'
 require 'deprec/recipes/ubuntu'
+require 'deprec/recipes/apache'
+require 'deprec/recipes/memcache'
 require 'deprec/third_party/mongrel_cluster/recipes'
 require 'deprec/third_party/vmbuilder/plugins'
 require 'deprec/third_party/railsmachine/recipes/apache'
 require 'deprec/third_party/railsmachine/recipes/mysql'
+require 'deprec/capistrano_extensions/cli_extensions.rb'
 require 'deprec/capistrano_extensions/deprec_extensions.rb'
 require 'deprec/capistrano_extensions/actor_extensions.rb'
 
 Capistrano.configuration(:must_exist).load do
-  set :application, lambda { application = Capistrano::CLI.password_prompt "Enter application name:" }
+  set :application, lambda { Capistrano::CLI.prompt "Enter application name: " }
   set :user, (defined?(user) ? user : ENV['USER']) # user who is deploying
   set :group, 'deploy'           # deployment group
   set :src_dir, (defined?(src_dir) ? src_dir : '/usr/local/src') # 3rd party src on servers 
@@ -30,7 +34,7 @@ Capistrano.configuration(:must_exist).load do
     install_packages_for_rails # install packages that come with distribution
     install_rubygems
     install_gems 
-    install_apache
+    apache_install
   end
   
   desc <<-DESC
@@ -70,7 +74,7 @@ Capistrano.configuration(:must_exist).load do
     files = ["#{deploy_to}/shared/log/mongrel.log", "#{deploy_to}/shared/log/#{rails_env}.log"]
     
     sudo "chgrp -R #{mongrel_group} #{tmp_dir} #{shared_dir}"
-    sudo "chmod 0775 #{tmp_dir} #{shared_dir}" 
+    sudo "chmod -R g+w #{tmp_dir} #{shared_dir}" 
     # set owner and group of mongrels file (if they exist)
     files.each { |file|
       sudo "chown #{mongrel_user} #{file} || exit 0"   
@@ -175,132 +179,6 @@ Capistrano.configuration(:must_exist).load do
     gem.upgrade
     gem.update_system
   end
-    
-  task :install_apache do
-    version = 'httpd-2.2.4'
-    set :src_package, {
-      :file => version + '.tar.gz',   
-      :md5sum => '3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz', 
-      :dir => version,  
-      :url => "http://www.apache.org/dist/httpd/#{version}.tar.gz",
-      :unpack => "tar zxf #{version}.tar.gz;",
-      :configure => %w(
-        ./configure
-        --enable-mods-shared=all
-        --enable-proxy 
-        --enable-proxy-balancer 
-        --enable-proxy-http 
-        --enable-rewrite  
-        --enable-cache 
-        --enable-headers 
-        --enable-ssl 
-        --enable-deflate 
-        --with-included-apr   #_so_this_recipe_doesn't_break_when_rerun
-        --enable-dav          #_for_subversion_
-        --enable-so           #_for_subversion_
-        ;
-        ).reject{|arg| arg.match '#'}.join(' '),
-      :make => 'make;',
-      :install => 'make install;',
-      :post_install => 'install -b support/apachectl /etc/init.d/httpd;'
-    }
-    apt.install( {:base => %w(zlib1g-dev zlib1g openssl libssl-dev)}, :stable )
-    deprec.download_src(src_package, src_dir)
-    deprec.install_from_src(src_package, src_dir)
-    # ubuntu specific - should instead call generic name which can be picked up by different distros
-    send(run_method, "update-rc.d httpd defaults")
-  end
-  
-  desc "Install PHP from source"
-  task :install_php do
-    version = 'php-5.2.2'
-    set :src_package, {
-      :file => version + '.tar.gz',
-      :md5sum => '7a920d0096900b2b962b21dc5c55fe3c  php-5.2.2.tar.gz', 
-      :dir => version,
-      :url => "http://www.php.net/distributions/#{version}.tar.gz",
-      :unpack => "tar zxf #{version}.tar.gz;",
-      :configure => %w(
-        ./configure 
-        --prefix=/usr/local/php
-        --with-apxs2=/usr/local/apache2/bin/apxs
-        --disable-ipv6
-        --enable-sockets
-        --enable-soap
-        --with-pcre-regex
-        --with-mysql
-        --with-zlib 
-        --with-gettext
-        --with-sqlite
-        --enable-sqlite-utf8
-        --with-openssl
-        --with-mcrypt
-        --with-ncurses
-        --with-jpeg-dir=/usr
-        --with-gd
-        --with-ctype
-        --enable-mbstring
-        --with-curl==/usr/lib 
-        ;
-        ).reject{|arg| arg.match '#'}.join(' '),
-      :make => 'make;',
-      :install => 'make install;',
-      :post_install => ""
-    }
-    apt.install( {:base => %w(zlib1g-dev zlib1g openssl libssl-dev 
-      flex libcurl3 libcurl3-dev libmcrypt-dev libmysqlclient15-dev libncurses5-dev 
-      libxml2-dev libjpeg62-dev libpng12-dev)}, :stable )
-    run "export CFLAGS=-O2;"
-    deprec.download_src(src_package, src_dir)
-    deprec.install_from_src(src_package, src_dir)
-    deprec.append_to_file_if_missing('/usr/local/apache2/conf/httpd.conf', 'AddType application/x-httpd-php .php')
-  end
-  
-
-  
-  # move all memcache stuff to separate file
-  set :memcache_ip, '127.0.0.1'
-  set :memcache_port, 11211
-  set :memcache_memory, 256
-  
-  # XXX needs thought/work
-  task :memcached_start do
-    run "memcached -d -m #{memcache_memory} -l #{memcache_ip} -p #{memcache_port}"
-  end
-  
-  # XXX needs thought/work
-  task :memcached_stop do
-    run "killall memcached"
-  end
-  
-  # XXX needs thought/work
-  task :memcached_restart do
-    memcached_stop
-    memcached_start
-  end
-  
-  task :install_memcached do
-    version = 'memcached-1.2.2'
-    set :src_package, {
-      :file => version + '.tar.gz',   
-      :md5sum => 'a08851f7fa7b15e92ee6320b7a79c321  memcached-1.2.2.tar.gz', 
-      :dir => version,  
-      :url => "http://www.danga.com/memcached/dist/#{version}.tar.gz",
-      :unpack => "tar zxf #{version}.tar.gz;",
-      :configure => %w{
-        ./configure
-        --prefix=/usr/local 
-        ;
-        }.reject{|arg| arg.match '#'}.join(' '),
-      :make => 'make;',
-      :install => 'make install;',
-      :post_install => 'install -b support/apachectl /etc/init.d/httpd;'
-    }
-    apt.install( {:base => %w(libevent-dev)}, :stable )
-    deprec.download_src(src_package, src_dir)
-    deprec.install_from_src(src_package, src_dir)
-  end
-  
   
   desc "Setup public symlink directories"
   task :setup_symlinks, :roles => [:app, :web] do
@@ -332,7 +210,7 @@ Capistrano.configuration(:must_exist).load do
   end
      
   task :setup_admin_account do
-    user = Capistrano::CLI.password_prompt "Enter userid for new user:" 
+    user = Capistrano::CLI.prompt "Enter userid for new user: " 
     deprec.useradd(user, :shell => '/bin/bash')
     puts "Setting pasword for new account"
     sudo_with_input("passwd #{user}", /UNIX password/) # ??? how many  versions of the prompt are there?
@@ -344,6 +222,15 @@ Capistrano.configuration(:must_exist).load do
   task :setup_admin_account_as_root do
     as_root { setup_admin_account }
   end 
+  
+  desc "Change password for the root account"
+  task :change_root_password do
+    sudo_with_input("passwd root", /UNIX password/) # ??? how many  versions of the prompt are there?
+  end
+
+  task :change_root_password_as_root do
+    as_root { change_root_password }
+  end
 
   
 end

data/lib/deprec/recipes/apache.rb

@@ -0,0 +1,91 @@
+Capistrano.configuration(:must_exist).load do
+
+  task :install_apache do # deprecated
+    apache_install
+  end
+  
+  task :apache_install do
+    version = 'httpd-2.2.4'
+    set :src_package, {
+      :file => version + '.tar.gz',   
+      :md5sum => '3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz', 
+      :dir => version,  
+      :url => "http://www.apache.org/dist/httpd/#{version}.tar.gz",
+      :unpack => "tar zxf #{version}.tar.gz;",
+      :configure => %w(
+        ./configure
+        --enable-mods-shared=all
+        --enable-proxy 
+        --enable-proxy-balancer 
+        --enable-proxy-http 
+        --enable-rewrite  
+        --enable-cache 
+        --enable-headers 
+        --enable-ssl 
+        --enable-deflate 
+        --with-included-apr   #_so_this_recipe_doesn't_break_when_rerun
+        --enable-dav          #_for_subversion_
+        --enable-so           #_for_subversion_
+        ;
+        ).reject{|arg| arg.match '#'}.join(' '),
+      :make => 'make;',
+      :install => 'make install;',
+      :post_install => 'install -b support/apachectl /etc/init.d/httpd;'
+    }
+    apt.install( {:base => %w(zlib1g-dev zlib1g openssl libssl-dev)}, :stable )
+    deprec.download_src(src_package, src_dir)
+    deprec.install_from_src(src_package, src_dir)
+    # ubuntu specific - should instead call generic name which can be picked up by different distros
+    send(run_method, "update-rc.d httpd defaults")
+  end
+  
+  task :install_php do # deprecated
+    php_install
+  end
+  
+  desc "Install PHP from source"
+  task :php_install do
+    version = 'php-5.2.2'
+    set :src_package, {
+      :file => version + '.tar.gz',
+      :md5sum => '7a920d0096900b2b962b21dc5c55fe3c  php-5.2.2.tar.gz', 
+      :dir => version,
+      :url => "http://www.php.net/distributions/#{version}.tar.gz",
+      :unpack => "tar zxf #{version}.tar.gz;",
+      :configure => %w(
+        ./configure 
+        --prefix=/usr/local/php
+        --with-apxs2=/usr/local/apache2/bin/apxs
+        --disable-ipv6
+        --enable-sockets
+        --enable-soap
+        --with-pcre-regex
+        --with-mysql
+        --with-zlib 
+        --with-gettext
+        --with-sqlite
+        --enable-sqlite-utf8
+        --with-openssl
+        --with-mcrypt
+        --with-ncurses
+        --with-jpeg-dir=/usr
+        --with-gd
+        --with-ctype
+        --enable-mbstring
+        --with-curl==/usr/lib 
+        ;
+        ).reject{|arg| arg.match '#'}.join(' '),
+      :make => 'make;',
+      :install => 'make install;',
+      :post_install => ""
+    }
+    apt.install( {:base => %w(zlib1g-dev zlib1g openssl libssl-dev 
+      flex libcurl3 libcurl3-dev libmcrypt-dev libmysqlclient15-dev libncurses5-dev 
+      libxml2-dev libjpeg62-dev libpng12-dev)}, :stable )
+    run "export CFLAGS=-O2;"
+    deprec.download_src(src_package, src_dir)
+    deprec.install_from_src(src_package, src_dir)
+    deprec.append_to_file_if_missing('/usr/local/apache2/conf/httpd.conf', 'AddType application/x-httpd-php .php')
+  end
+
+end