Changeset 115

Timestamp:

07/01/07 17:07:50 (2 years ago)

Author:

mbailey

Message:

merged 1-7-stable branch changes r74:114 into the trunk.

Files:

• trunk/CHANGELOG (modified) (3 diffs)
• trunk/deprec.gemspec (modified) (1 diff)
• trunk/docs/README.quickstart (copied) (copied from branches/1-7-stable/docs/README.quickstart)
• trunk/docs/README.slicehost (modified) (1 diff)
• trunk/docs/README.svn_trac (copied) (copied from branches/1-7-stable/docs/README.svn_trac)
• trunk/lib/deprec/capistrano_extensions/cli_extensions.rb (copied) (copied from branches/1-7-stable/lib/deprec/capistrano_extensions/cli_extensions.rb)
• trunk/lib/deprec/capistrano_extensions/deprec_extensions.rb (modified) (2 diffs)
• trunk/lib/deprec/generators/deprec/templates/deploy.rb (modified) (2 diffs)
• trunk/lib/deprec/recipes.rb (modified) (6 diffs)
• trunk/lib/deprec/recipes/apache.rb (copied) (copied from branches/1-7-stable/lib/deprec/recipes/apache.rb)
• trunk/lib/deprec/recipes/memcache.rb (copied) (copied from branches/1-7-stable/lib/deprec/recipes/memcache.rb)
• trunk/lib/deprec/recipes/rails.rb (copied) (copied from branches/1-7-stable/lib/deprec/recipes/rails.rb)
• trunk/lib/deprec/recipes/svn.rb (modified) (7 diffs)
• trunk/lib/deprec/recipes/templates (deleted)
• trunk/lib/deprec/recipes/trac.rb (copied) (copied from branches/1-7-stable/lib/deprec/recipes/trac.rb)
• trunk/lib/deprec/templates (copied) (copied from branches/1-7-stable/lib/deprec/templates)
• trunk/lib/deprec/third_party/railsmachine/recipes/apache.rb (modified) (1 diff)
• trunk/lib/deprec/third_party/railsmachine/recipes/mysql.rb (modified) (2 diffs)
• trunk/lib/deprec/third_party/railsmachine/recipes/svn.rb (deleted)

trunk/CHANGELOG

@@ -3 +3 @@
-== SVN
-
+* bugfix :setup_svn no longer stomps on :repository config item
+* new task :generate_database_yml creates shared/config/database.yml on server [Mike Bailey]
+* new config item :database_yml_in_scm causes shared/config/database.yml to be symlinked after deploy if set to false [Mike Bailey]
+* added defaults to prompt-> Capistrano::CLI.prompt('Enter database host', 'localhost') [Mike Bailey]
+
+== 1.8.0
+
+* fixed scm_setup. it parses :repository if set and prompts user for values if not [Mike Bailey]
+* added "role :scm, domain" to generated deploy.rb [Mike Bailey]
+* added :trac_install, :trac_setup, :trac_start, :trac_stop  [Mike Bailey]
+* added :change_root_password and :change_root_password_as_root [Mike Bailey]
+* moved templates dir [Mike Bailey]
+* bugfix :db_setup now re-runnable
+
-== 1.7.1
-
+
+
-
-== 1.7.0
-
-mb
-mb
-
+Mike B
+Mike B
+ [Mike Bailey]
-
-== 1.6.0
-
-mb
+Mike B
-
-== 1.5.1
-
-mb
+Mike B
-
-== 1.5.0
-
-mb
+Mike B
-  - now don't fail if log files do not exist (e.g initial deployment)
-  - is called by :after_symlink task instead of :after_update 
@@ -29 +44 @@
-
-* updated version from 1.4.x to 1.5.x due to pretty big change made
-mb
+Mike B
-
-== 1.4.2
-
-mb
-mb
-mb
+Mike B
+Mike B
+Mike B
-
-== 1.4.0
-
-mb
-mb
+Mike B
+Mike B
-
-== 1.3.1
@@ -48 +63 @@
-== 1.3.0
-
-mb
-mb
-mb
-mb
-mb
+Mike B
+Mike B
+Mike B
+Mike B
+Mike B
-
-== 1.2.2
-
-mb
-mb
+Mike B
+Mike B
-
-== 1.2.1
-
-mb
+Mike B
-
-== 1.2.0

trunk/deprec.gemspec

@@ -5 +5 @@
-SPEC = Gem::Specification.new do |spec|
-  spec.name = 'deprec'
-7.1
+9.0
-  spec.summary = 'deployment recipes for capistrano'
-  spec.description = <<-EOF

trunk/docs/README.slicehost

@@ -1 @@
-extras
+specific notes for deprec
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
-
+# 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

trunk/lib/deprec/capistrano_extensions/deprec_extensions.rb

@@ -3 +3 @@
-
-module Deprec
-recipes', '
+
-
-  def render_template_to_file(template_name, destination_file_name, templates_dir = DEPREC_TEMPLATES_BASE)
-
+ # XXX this to be removed
-    
-    file = File.join(templates_dir, template_name)
@@ -22 +22 @@
-    sudo <<-END
-    sh -c '
-
+-F 
-      test ! -f #{filename} ||
-      echo "#{value}" >> #{filename}

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

@@ -14 +14 @@
-role :app, domain
-role :db,  domain, :primary => true
+role :scm, domain
-
-# =============================================================================
@@ -33 +34 @@
-# Automatically symlink these directories from current/public to shared/public.
-# set :app_symlinks, %w{photo, document, asset}
+
+# =============================================================================
+# SPECIAL OPTIONS
+# =============================================================================
+# These options allow you to tweak deprec behaviour
+
+# If you do not keep database.yml in source control, set this to false.
+# After new code is deployed, deprec will symlink current/config/database.yml 
+# to shared/config/database.yml
+#
+# You can generate shared/config/database.yml with 'cap generate_database_yml'
+#
+# set :database_yml_in_scm, true
-
-# =============================================================================

trunk/lib/deprec/recipes.rb

@@ -1 +1 @@
-require 'deprec/recipes/ssh'
-require 'deprec/recipes/svn'
+require 'deprec/recipes/trac'
+require 'deprec/recipes/rails'
-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
-application = Capistrano::CLI.password_prompt "Enter application name:
+Capistrano::CLI.prompt "Enter application name
-  set :user, (defined?(user) ? user : ENV['USER']) # user who is deploying
-  set :group, 'deploy'           # deployment group
@@ -31 +36 @@
-    install_rubygems
-    install_gems 
-install_apache
+apache_install
-  end
-  
@@ -71 +76 @@
-    
-    sudo "chgrp -R #{mongrel_group} #{tmp_dir} #{shared_dir}"
-0775
+-R g+w
-    # set owner and group of mongrels file (if they exist)
-    files.each { |file|
@@ -176 +181 @@
-    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"
@@ -333 +212 @@
-     
-  task :setup_admin_account do
-assword_prompt "Enter userid for new user:
+rompt "Enter userid for new user
-    deprec.useradd(user, :shell => '/bin/bash')
-    puts "Setting pasword for new account"
@@ -345 +224 @@
-    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
-
-  

trunk/lib/deprec/recipes/svn.rb

@@ -1 +1 @@
-require 'fileutils'
+require 'uri'
-
-Capistrano.configuration(:must_exist).load do
@@ -10 +11 @@
-  # however the SVN docs convinced me it's probably overkill.
-  # http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.serverconfig.pathbasedauthz
+  #
-  set :scm_group, 'scm'
-  
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  
+  set (:scm_host) do
+    if repository
+      URI.parse(repository).host || 'localhost'
+    elsif ENV['HOSTS']
+      svn_host = ENV['HOSTS']
+    else
+      Capistrano::CLI.prompt('svn host')
+    end
+  end
+
+  # This is the actual path in the svn repos where we'll check our project into
+  set (:repos_path) do
+    repository ? URI.parse(repository).path : Capistrano::CLI.prompt('svn repos path')
+  end
+
+  # We'll calculate this based on the repos_path. It's used when initializing the repository
+  set (:repos_root) do
+    (repository ? URI.parse(repository).path : repos_path).sub(/\/(trunk|tags|branches)$/, '')
+  end
-  
+  # account name to perform actions on
+  # this is a hack to allow us to optionally pass a variable to tasks 
+  set (:svn_account) do
+    Capistrano::CLI.prompt('account name')
+  end
+  
+  # I'd like to be able to construct :repository if it's not explicitly set
+  # However we're grabbing values from it in the lines above so it would get a bit recursive
+  # set :repository, lambda { "#{svn_scheme}://#{scm_host == 'localhost' ? '/' : user+'@'+scm_host}#{repos_path}" }
+  
+  # XXX requires apache to have already been installed...
-  desc "install Subversion version control system"
-install_svn
+svn_install, :roles => :scm
-    # svn 1.4 server improves on 1.3 and is backwards compatible with 1.3 clients
-    # http://subversion.tigris.org/svn_1.4_releasenotes.html
@@ -23 +68 @@
-    # http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.reposadmin.basics.backends
-    #
-
+
+
+
+
-    set :src_package, {
-      :file => version + '.tar.gz',   
-6b991b63e3e1f69670c9e15708e40176 subversion-1.4.3
+702655defa418bab8f683f6268b4fd30  subversion-1.4.4
-      :dir => version,  
-      :url => "http://subversion.tigris.org/downloads/#{version}.tar.gz",
@@ -36 +84 @@
-        --with-apr=/usr/local/apache2 
-        --with-apr-util=/usr/local/apache2
+        PYTHON=/usr/bin/python
-        ;
-        ).reject{|arg| arg.match '#'}.join(' ') , # DRY this up
-      :make => 'make;',
-
+
+
+
+
+
+
-    }
-
+
+
-    deprec.download_src(src_package, src_dir)
-    deprec.install_from_src(src_package, src_dir)
-  end
-  
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  task :svn_create_repos, :roles => :scm do
-
-
-
-
-
-
-
+
+
+
+
+
-  end
-
-  # XXX check through and test the next two [mike]
-  
-from
-code into sv
-  do
+Adapted from code in
+project into subversio
+, :roles => :scm do 
-    new_path = "../#{application}"
-    tags = repository.sub("trunk", "tags")
@@ -76 +148 @@
-    system "svn co #{repository} #{application}"
-    Dir.chdir application
+    svn_remove_log_and_tmp
+    puts "Your repository is: #{repository}" 
+  end
+  
+  # Lifted from Bradley Taylors RailsMachine gem
+  desc "remove and ignore log files and tmp from subversion"
+  task :svn_remove_log_and_tmp, :roles => :scm  do
-    puts "removing log directory contents from svn"
-    system "svn remove log/*"
@@ -81 +160 @@
-    system "svn propset svn:ignore '*.log' log/"
-    system "svn update log/"
-
-
+
+
+
+
+
-    puts "ignoring tmp directory"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    system "svn update tmp/"
-    puts "committing changes"
@@ -108 +175 @@
-  end
-  
-
+# 
-  task :svn_cache_credentials do
-    run_with_input "svn list #{repository}"
-  end
+  
+
+  
-  
-  # XXX TODO

trunk/lib/deprec/third_party/railsmachine/recipes/apache.rb

@@ -62 +62 @@
-  end
-  
+
-  desc "Restart Apache "
-
+
+
+
+
+
-    send(run_method, "#{apache_ctl} restart")
-  end

trunk/lib/deprec/third_party/railsmachine/recipes/mysql.rb

@@ -6 +6 @@
-  
-  def execute(sql, user)
-
+
+
-      handle_mysql_password(user, channel, stream, data)
-    end
@@ -46 +47 @@
-    # on_rollback {}
-    
+    # 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 depployment using rails defaults simpler
+    sudo "sudo ln -sf /var/run/mysqld/mysqld.sock /tmp/mysql.sock"
+    
-    set_mysql_admin
-    read_config
-    
-
+IF NOT EXISTS 
-    sql += "GRANT ALL PRIVILEGES ON #{db_name}.* TO #{db_user}@localhost IDENTIFIED BY '#{db_password}';"  
-    mysql.execute sql, mysql_admin