deprec 2.1.19 → 2.2.0

data/lib/deprec/recipes/rubygems.rb

@@ -0,0 +1,29 @@
+# Copyright by Mike Bailey. All rights reserved.
+Capistrano::Configuration.instance(:must_exist).load do
+
+  namespace :deprec do
+    namespace :rubygems do
+
+      SRC_PACKAGES[:rubygems] = {
+        :md5sum => "b5badb7c5adda38d9866fa21ae46bbcc  rubygems-1.4.2.tgz",
+        :url => "http://rubyforge.org/frs/download.php/73882/rubygems-1.4.2.tgz",
+        :configure => "",
+        :make =>  "",
+        :install => 'ruby setup.rb; exit 0;' # rubygems 1.4.2 is a bit broken http://bit.ly/k1IfUa
+      }
+
+      desc "Install Rubygems"
+      task :install do
+        deprec2.download_src(SRC_PACKAGES[:rubygems])
+        deprec2.install_from_src(SRC_PACKAGES[:rubygems])
+      end
+
+      desc "Upgrade to the latest version of Rubygems"
+      task :update_system do
+        gem2.update_system
+      end
+
+    end
+  end
+
+end

data/lib/deprec/recipes/sqlite.rb

@@ -36,7 +36,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       # We need these stubs for deprec:rails:setup_database
     end
     
-    desc "Grant user access to Database" 
+    # "Grant user access to Database" 
     task :grant_user_access_to_database do
       # Not needed for sqlite
       # We need these stubs for deprec:rails:setup_database

data/lib/deprec/recipes/ssh.rb

@@ -20,6 +20,7 @@ Capistrano::Configuration.instance(:must_exist).load do
          :owner => 'root:root'}
       ]
       
+      desc "Generate SSH config files locally"
       task :config_gen do        
         SYSTEM_CONFIG_FILES[:ssh].each do |file|
           deprec2.render_template(:ssh, file)

data/lib/deprec/recipes/svn.rb

@@ -1,171 +1,12 @@
 # Copyright 2006-2008 by Mike Bailey. All rights reserved.
-require 'fileutils'
-require 'uri'
-
-# http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.serverconfig.choosing.apache
-
 Capistrano::Configuration.instance(:must_exist).load do 
   namespace :deprec do 
     namespace :svn do
   
-      set :scm_group, 'scm'
-  
-      # Extract svn attributes from :repository URL
-      # 
-      # Two examples of :repository entries are:
-      #
-      #   set :repository, 'svn+ssh://scm.deprecated.org/var/svn/deprec/trunk'
-      #   set :repository, 'file:///tmp/svn/deprec/trunk'
-      #
-      # This has only been tested with svn+ssh but file: should work.
-      #
-      set (:svn_scheme) { URI.parse(repository).scheme }  
-      set (:svn_host)   { URI.parse(repository).host }
-      set (:repos_path) { URI.parse(repository).path }
-      set (:repos_root) { 
-        URI.parse(repository).path.sub(/\/(trunk|tags|branches)$/, '') 
-      }
-  
-      # account name to perform actions on (such as granting access to an account)
-      # this is a hack to allow us to optionally pass a variable to tasks 
-      set (:svn_account) do
-        Capistrano::CLI.ui.ask 'account name'
-      end
-  
-      set(:svn_backup_dir) { File.join(backup_dir, 'svn') }
-  
       desc "Install Subversion"
       task :install do
         install_deps
-        # XXX should really check if apache has already been installed
-        # XXX can do that when we move to rake
-        # deprec2.download_src(src_package, src_dir)
-        # deprec2.install_from_src(src_package, src_dir)
-      end
-  
-      desc "install dependencies for Subversion"
-      task :install_deps do
-        apt.install( {:base => %w(subversion)}, :stable )
-        # XXX deprec1 - was building from source to get subversion-1.4.5 onto dapper. Compiled swig bindings for trac
-        # apt.install( {:base => %w(build-essential wget libneon25 libneon25-dev swig python-dev libexpat1-dev)}, :stable )
-      end
-  
-      desc "grant a user access to svn repos"
-      task :grant_user_access, :roles => :scm do
-        # creates account, scm_group and adds account to group
-        deprec2.useradd(svn_account)
-        deprec2.groupadd(scm_group) 
-        deprec2.add_user_to_group(svn_account, scm_group)
-      end
-  
-      desc "Create subversion repository and import project into it"
-      task :setup, :roles => :scm do 
-        create_repos
-        import
-      end
-  
-      desc "Create a subversion repository"
-      task :create_repos, :roles => :scm do
-        set :svn_account, top.user
-        grant_user_access
-        deprec2.mkdir(repos_root, :mode => 02775, :group => scm_group, :via => :sudo)
-        sudo "svnadmin verify #{repos_root} > /dev/null 2>&1 || sudo svnadmin create #{repos_root}"
-        sudo "chmod -R g+w #{repos_root}"
-      end
-  
-      # Adapted from code in Bradley Taylors RailsMachine gem
-      desc "Import project into subversion repository."
-      task :import, :roles => :scm do 
-        new_path = "../#{application}"
-        tags = repository.sub("trunk", "tags")
-        branches = repository.sub("trunk", "branches")
-        puts "Adding branches and tags"
-        system "svn mkdir -m 'Adding tags and branches directories' #{tags} #{branches}"
-        puts "Importing application."
-        system "svn import #{repository} -m 'Import'"
-        cwd = Dir.getwd
-        puts "Moving application to new directory"
-        Dir.chdir '../'
-        system "mv #{cwd} #{cwd}.imported"
-        puts "Checking out application."
-        system "svn co #{repository} #{application}"
-        Dir.chdir application
-        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 :remove_log_and_tmp, :roles => :scm  do
-        puts "removing log directory contents from svn"
-        system "svn remove log/*"
-        puts "ignoring log directory"
-        system "svn propset svn:ignore '*.log' log/"
-        system "svn update log/"
-        puts "removing contents of tmp sub-directorys from svn"
-        system "svn remove tmp/cache/*"
-        system "svn remove tmp/pids/*"
-        system "svn remove tmp/sessions/*"
-        system "svn remove tmp/sockets/*"
-        puts "ignoring tmp directory"
-        system "svn propset svn:ignore '*' tmp/cache"
-        system "svn propset svn:ignore '*' tmp/pids"
-        system "svn propset svn:ignore '*' tmp/sessions"
-        system "svn propset svn:ignore '*' tmp/sockets"
-        system "svn update tmp/"
-        puts "committing changes"
-        system "svn commit -m 'Removed and ignored log files and tmp'"
-      end
-  
-      # desc "Cache svn name and password on the server. Useful for http-based repositories."
-      task :cache_credentials do
-        run_with_input "svn list #{repository}"
-      end
-  
-      desc "create backup of trac repository"
-      task :backup, :roles => :scm do
-        # http://svnbook.red-bean.com/nightly/en/svn.reposadmin.maint.html#svn.reposadmin.maint.backup
-        # XXX do we need this? insane!
-        # echo "REPOS_BASE=/var/svn" > ~/.svntoolsrc
-        DATE=`date +%Y%m%d-%a`
-    
-        timestamp = Time.now.strftime("%Y%m%d-%a")
-        deprec2.mkdir(svn_backup_dir, :owner => :root, :group => :deploy, :mode => 0775, :via => :sudo)
-        dest_dir = File.join(svn_backup_dir, "#{application}_#{timestamp}")
-        sudo "svnadmin hotcopy #{repos_root} #{dest_dir}"
       end
-
-      task :restore, :roles => :scm do
-        # prompt user to select from list of locally stored backups
-        # tracd_stop
-        # copy out backup
-      end
-  
-  
-      # XXX TODO
-      # desc "backup repository" 
-      # task :svn_backup_respository, :roles => :scm do
-      #   puts "read http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.reposadmin.maint.backup"
-      # end
-
-      end 
+    end  
   end
 end
-
-# svnserve setup
-# I've previously used ssh exclusively I've decided svnserve is a reasonable choice for collaboration on open source projects.
-# It's easier to setup than apache/ssl webdav access.
-#
-# sudo useradd svn
-# sudo mkdir -p /var/svn/deprec_svnserve_root
-# sudo ln -sf /var/www/apps/deprec/repos /var/svn/deprec_svnserve_root/deprec
-# sudo chown -R svn /var/svn/deprec_svnserve_root/deprec
-
-#
-# XXX put password file into svn and command to push it
-# 
-# # run svnserve
-# sudo -u svn svnserve --daemon --root /var/svn/deprec_svnserve_root
-# 
-# # check it out now
-# svn co svn://scm.deprecated.org/deprec/trunk deprec

data/lib/deprec/recipes/users.rb

@@ -3,25 +3,14 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do
     namespace :users do
 
-      set(:users_target_user) { Capistrano::CLI.ui.ask "Enter userid for new user" do |q| q.default = current_user; end }
+      set(:users_target_user) { Capistrano::CLI.ui.ask "Enter userid" do |q| q.default = current_user; end }
       set(:users_target_group) { Capistrano::CLI.ui.ask "Enter group name for new user" do |q| q.default = 'deploy'; end }
       set(:users_make_admin) { Capistrano::CLI.ui.ask "Should this be an admin account?" do |q| q.default = 'no'; end }
       
       desc "Create account"
       task :add do
-        [users_target_user, users_target_group, users_make_admin] # get input
-       
-        while true do
-          new_password = Capistrano::CLI.ui.ask("Enter new password for #{users_target_user}") { |q| q.echo = false }
-          password_conf = Capistrano::CLI.ui.ask("Re-enter new password for #{users_target_user}") { |q| q.echo = false }
-          if new_password != password_conf
-            puts "Fail. Passwords do not match.\n\n"
-          elsif new_password.chomp == ""
-            puts "Fail. Passwords cannot be empty.\n\n"
-          else
-            break
-          end
-        end 
+        [users_target_user, users_make_admin] # get input
+        new_password = get_new_password
 
         # Grab a list of all users with keys
         if users_target_user == 'all'
@@ -47,8 +36,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
       desc "Change user password"
       task :passwd do
-        new_password = Capistrano::CLI.ui.ask("Enter new password for #{users_target_user}") { |q| q.echo = false }
-  
+        new_password = get_new_password
         deprec2.invoke_with_input("passwd #{users_target_user}", /UNIX password/, new_password) 
       end
       
@@ -63,6 +51,21 @@ Capistrano::Configuration.instance(:must_exist).load do
         add
       end
 
+      def get_new_password
+        while true do
+          new_password = Capistrano::CLI.ui.ask("Enter new password for #{users_target_user}") { |q| q.echo = false }
+          password_conf = Capistrano::CLI.ui.ask("Re-enter new password for #{users_target_user}") { |q| q.echo = false }
+          if new_password != password_conf
+            puts "Fail. Passwords do not match.\n\n"
+          elsif new_password.chomp == ""
+            puts "Fail. Passwords cannot be empty.\n\n"
+          else
+            break
+          end
+        end 
+        new_password
+      end
+
     end
   end
 end

data/lib/deprec/recipes_minus_rails.rb

@@ -6,61 +6,64 @@ require "#{File.dirname(__FILE__)}/recipes/canonical"
 require "#{File.dirname(__FILE__)}/recipes/deprec"
 require "#{File.dirname(__FILE__)}/recipes/deprecated"
 
-# require "#{File.dirname(__FILE__)}/recipes/chef"
-require "#{File.dirname(__FILE__)}/recipes/ec2"
-require "#{File.dirname(__FILE__)}/recipes/vmware_tools"
+# Updated for deprec3
 
-require "#{File.dirname(__FILE__)}/recipes/mongrel"
-require "#{File.dirname(__FILE__)}/recipes/passenger"
-require "#{File.dirname(__FILE__)}/recipes/mysql"
-require "#{File.dirname(__FILE__)}/recipes/postgresql"
-require "#{File.dirname(__FILE__)}/recipes/sqlite"
-require "#{File.dirname(__FILE__)}/recipes/couchdb"
+require "#{File.dirname(__FILE__)}/recipes/users"
+require "#{File.dirname(__FILE__)}/recipes/network"
 require "#{File.dirname(__FILE__)}/recipes/mri"
 require "#{File.dirname(__FILE__)}/recipes/ree"
-require "#{File.dirname(__FILE__)}/recipes/apache"
-require "#{File.dirname(__FILE__)}/recipes/nginx"
-
-require "#{File.dirname(__FILE__)}/recipes/bash"
+require "#{File.dirname(__FILE__)}/recipes/rack"
+require "#{File.dirname(__FILE__)}/recipes/rubygems"
+require "#{File.dirname(__FILE__)}/recipes/nagios3"
+require "#{File.dirname(__FILE__)}/recipes/nrpe"
 require "#{File.dirname(__FILE__)}/recipes/git"
-# require "#{File.dirname(__FILE__)}/recipes/gitosis"
 require "#{File.dirname(__FILE__)}/recipes/svn"
-# require "#{File.dirname(__FILE__)}/recipes/integrity"
 
-require "#{File.dirname(__FILE__)}/recipes/users"
-require "#{File.dirname(__FILE__)}/recipes/ssh"
-require "#{File.dirname(__FILE__)}/recipes/php"
-# require "#{File.dirname(__FILE__)}/recipes/scm/trac"
+# To be updated for deprec3
 
-require "#{File.dirname(__FILE__)}/recipes/aoe"
+require "#{File.dirname(__FILE__)}/recipes/ssh"
+require "#{File.dirname(__FILE__)}/recipes/passenger"
+require "#{File.dirname(__FILE__)}/recipes/mysql"
+require "#{File.dirname(__FILE__)}/recipes/postgresql"
+require "#{File.dirname(__FILE__)}/recipes/apache"
+require "#{File.dirname(__FILE__)}/recipes/haproxy"
+require "#{File.dirname(__FILE__)}/recipes/heartbeat"
+require "#{File.dirname(__FILE__)}/recipes/monit"
+require "#{File.dirname(__FILE__)}/recipes/collectd"
+require "#{File.dirname(__FILE__)}/recipes/ubuntu"
 
-require "#{File.dirname(__FILE__)}/recipes/xen"
-require "#{File.dirname(__FILE__)}/recipes/xentools"
+# To be decided...
 
+require "#{File.dirname(__FILE__)}/recipes/ec2"
+require "#{File.dirname(__FILE__)}/recipes/vmware_tools"
+require "#{File.dirname(__FILE__)}/recipes/mongrel"
+require "#{File.dirname(__FILE__)}/recipes/sqlite"
+require "#{File.dirname(__FILE__)}/recipes/nginx"
+require "#{File.dirname(__FILE__)}/recipes/bash"
+require "#{File.dirname(__FILE__)}/recipes/php"
+require "#{File.dirname(__FILE__)}/recipes/aoe"
 require "#{File.dirname(__FILE__)}/recipes/ddclient"
 require "#{File.dirname(__FILE__)}/recipes/ntp"
 require "#{File.dirname(__FILE__)}/recipes/logrotate"
 require "#{File.dirname(__FILE__)}/recipes/ssl"
-
 require "#{File.dirname(__FILE__)}/recipes/postfix"
 require "#{File.dirname(__FILE__)}/recipes/memcache"
-require "#{File.dirname(__FILE__)}/recipes/monit"
-require "#{File.dirname(__FILE__)}/recipes/network"
-require "#{File.dirname(__FILE__)}/recipes/nagios"
-require "#{File.dirname(__FILE__)}/recipes/collectd"
 require "#{File.dirname(__FILE__)}/recipes/syslog"
 require "#{File.dirname(__FILE__)}/recipes/syslog_ng"
 require "#{File.dirname(__FILE__)}/recipes/stunnel"
-require "#{File.dirname(__FILE__)}/recipes/heartbeat"
-require "#{File.dirname(__FILE__)}/recipes/haproxy"
-
-require "#{File.dirname(__FILE__)}/recipes/ubuntu"
 require "#{File.dirname(__FILE__)}/recipes/lvm"
 require "#{File.dirname(__FILE__)}/recipes/vnstat"
-require "#{File.dirname(__FILE__)}/recipes/sphinx"
 require "#{File.dirname(__FILE__)}/recipes/utils"
+
+# Retired recipes
+#
+# require "#{File.dirname(__FILE__)}/recipes/integrity"
+# require "#{File.dirname(__FILE__)}/recipes/xen"
+# require "#{File.dirname(__FILE__)}/recipes/xentools"
+# require "#{File.dirname(__FILE__)}/recipes/scm/trac"
+# require "#{File.dirname(__FILE__)}/recipes/sphinx"
 # require "#{File.dirname(__FILE__)}/recipes/apt_mirror"
-# require "#{File.dirname(__FILE__)}/recipes/wordpress" Not working
-require "#{File.dirname(__FILE__)}/recipes/wpmu"
-require "#{File.dirname(__FILE__)}/recipes/ar_sendmail"
-require "#{File.dirname(__FILE__)}/recipes/starling"
+# require "#{File.dirname(__FILE__)}/recipes/wpmu"
+# require "#{File.dirname(__FILE__)}/recipes/ar_sendmail"
+# require "#{File.dirname(__FILE__)}/recipes/starling"
+# require "#{File.dirname(__FILE__)}/recipes/couchdb"

data/lib/deprec/templates/apache/CHANGES.txt

@@ -0,0 +1,11 @@
+apache2.conf
+- natty uses relative paths for things like "Include ports.conf"
+
+envvars
+- natty adds stuff
+
+mods-available/info.conf # and some others
+- natty uses variable for path prefix 
+
+mods-available/mime.conf
+- natty changes language list

data/lib/deprec/templates/mysql/my.cnf.erb

@@ -32,14 +32,19 @@ nice		= 0
 #
 # * Basic Settings
 #
+
+#
+# * IMPORTANT
+#   If you make changes to these settings and your system uses apparmor, you may
+#   also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
+#
+
 user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
 socket		= /var/run/mysqld/mysqld.sock
 port		= 3306
 basedir		= /usr
 datadir		= /var/lib/mysql
 tmpdir		= /tmp
-language	= /usr/share/mysql/english
 skip-external-locking
 #
 # Instead of skip-networking the default is now to listen only on
@@ -50,25 +55,30 @@ bind-address		= 127.0.0.1
 #
 key_buffer		= 16M
 max_allowed_packet	= 16M
-thread_stack		= 128K
-thread_cache_size	= 8
+thread_stack		= 192K
+thread_cache_size       = 8
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+myisam-recover         = BACKUP
 #max_connections        = 100
 #table_cache            = 64
 #thread_concurrency     = 10
 #
 # * Query Cache Configuration
 #
-query_cache_limit       = 1M
+query_cache_limit	= 1M
 query_cache_size        = 16M
 #
 # * Logging and Replication
 #
 # Both location gets rotated by the cronjob.
 # Be aware that this log type is a performance killer.
-#log		= /var/log/mysql/mysql.log
-#
-# Error logging goes to syslog. This is a Debian improvement :)
-#
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/log/mysql/mysql.log
+#general_log             = 1
+
+log_error                = /var/log/mysql/error.log
+
 # Here you can see queries with especially long duration
 #log_slow_queries	= /var/log/mysql/mysql-slow.log
 #long_query_time = 2
@@ -78,24 +88,16 @@ query_cache_size        = 16M
 # note: if you are setting up a replication slave, see README.Debian about
 #       other settings you may need to change.
 #server-id		= 1
-log_bin			= /var/log/mysql/mysql-bin.log
-# WARNING: Using expire_logs_days without bin_log crashes the server! See README.Debian!
+#log_bin			= /var/log/mysql/mysql-bin.log
 expire_logs_days	= 10
 max_binlog_size         = 100M
 #binlog_do_db		= include_database_name
 #binlog_ignore_db	= include_database_name
 #
-# * BerkeleyDB
-#
-# Using BerkeleyDB is now discouraged as its support will cease in 5.1.12.
-skip-bdb
-#
 # * InnoDB
 #
 # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
 # Read the manual for more InnoDB related options. There are many!
-# You might want to disable InnoDB to shrink the mysqld process by circa 100MB.
-#skip-innodb
 #
 # * Security Features
 #
@@ -121,20 +123,8 @@ max_allowed_packet	= 16M
 [isamchk]
 key_buffer		= 16M
 
-#
-# * NDB Cluster
-#
-# See /usr/share/doc/mysql-server-*/README.Debian for more information.
-#
-# The following configuration is read by the NDB Data Nodes (ndbd processes)
-# not from the NDB Management Nodes (ndb_mgmd processes).
-#
-# [MYSQL_CLUSTER]
-# ndb-connectstring=127.0.0.1
-
-
 #
 # * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
 #
 !includedir /etc/mysql/conf.d/
-