deprec 2.1.18 → 2.1.19

data/CHANGELOG

@@ -1,5 +1,10 @@
 # deprec changelog
 
+= 2.1.19 (Feb 4, 2011)
+
+* replaced mailx with mailutils
+* cap deprec:apache:vhost # handy vhost generator
+
 = 2.1.18 (Feb 4, 2011)
 
 * bugfix: nagios report plugin execution was not installing

data/lib/deprec/recipes/{web/apache.rb → apache.rb}

@@ -4,24 +4,50 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :apache do
       
       set :apache_user, 'www-data'
+      set :apache_log_dir, '/var/log/apache2'
       set :apache_vhost_dir, '/etc/apache2/sites-available'
       set :apache_ssl_enabled, false
       set :apache_ssl_ip, nil
       set :apache_ssl_forward_all, apache_ssl_enabled
       set :apache_ssl_chainfile, false
-      set :apache_modules_enabled, %w(rewrite ssl proxy_balancer proxy_http deflate expires headers)
-      set :apache_log_dir, '/var/log/apache2'
+      set :apache_modules_enabled, 
+        %w(rewrite ssl proxy_balancer proxy_http deflate expires headers)
+
+      # Start apache vhost extras
+      # These are only used for generating vhost files with: 
+      #
+      #   cap deprec:apache:vhost
+      #
+      set(:apache_vhost_domain) { Capistrano::CLI.ui.ask 'Primary domain' }
+      set(:apache_vhost_server_alii) { 
+        Capistrano::CLI.ui.ask('ServerAlii (space separated)' ).split(' ')
+      }
+      set :apache_vhost_access_log_type, 'combined'
+      set :apache_vhost_canonicalize_hostname, true
+      set(:apache_vhost_access_log) { 
+        File.join(apache_log_dir, "#{apache_vhost_domain}-access.log")
+      }
+      set(:apache_vhost_error_log) { 
+        File.join(apache_log_dir, "#{apache_vhost_domain}-error.log")
+      }
+      set(:apache_vhost_document_root) { 
+        File.join('/var/apps', "#{apache_vhost_domain}", 'public')
+      }
+      set :apache_vhost_rack_env, false
+      # End apache vhost extras
+
        
       desc "Install apache"
       task :install do
         install_deps
-        enable_modules
-        reload
+        config
       end
       
       # install dependencies for apache
       task :install_deps do
-        apt.install( {:base => %w(apache2-mpm-prefork apache2-prefork-dev rsync ssl-cert)}, :stable )
+        apt.install( 
+          {:base => %w(apache2-mpm-prefork apache2-prefork-dev rsync ssl-cert)},
+          :stable )
       end
       
       SYSTEM_CONFIG_FILES[:apache] = [
@@ -44,6 +70,11 @@ Capistrano::Configuration.instance(:must_exist).load do
         { :template => 'status.conf.erb',
           :path => '/etc/apache2/mods-available/status.conf',
           :mode => 0644,
+          :owner => 'root:root'},
+
+        { :template => 'default.erb',
+          :path => '/etc/apache2/sites-available/default',
+          :mode => 0644,
           :owner => 'root:root'}
           
       ]
@@ -77,6 +108,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Push apache config files to server"
       task :config, :roles => :web do
         config_system
+        enable_modules
         reload
       end
       
@@ -90,6 +122,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Push apache config files to server"
       task :config_system, :roles => :web do
         deprec2.push_configs(:apache, SYSTEM_CONFIG_FILES[:apache])
+        run "#{sudo} touch /var/www/check.txt" # Used to test webserver up
       end
       
       # Stub so generic tasks don't fail (e.g. deprec:web:config_project)
@@ -99,10 +132,19 @@ Capistrano::Configuration.instance(:must_exist).load do
         #
         top.deprec.ssl.config if apache_ssl_enabled
       end
+
+      task :vhost do
+        file = { 
+          :template => 'vhost.erb',
+          :path => "/etc/apache2/sites-available/#{apache_vhost_domain}",
+          :mode => 0644,
+          :owner => 'root:root'
+        }
+        deprec2.render_template(:apache, file)
+      end
       
       task :enable_modules, :roles => :web do
         apache_modules_enabled.each { |mod| sudo "a2enmod #{mod}" }
-        reload
       end
       
       desc "Start Apache"

data/lib/deprec/recipes/haproxy.rb

@@ -4,11 +4,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :haproxy do
       
       SRC_PACKAGES[:haproxy] = {
-        :md5sum => "0d6019b79631048765a7dfd55f1875cd  haproxy-1.4.0.tar.gz",
-        :url => "http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.0.tar.gz",
+        :md5sum => "4f0638652d7800860838dc195da335d8  haproxy-1.4.11.tar.gz",
+        :url => "http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.11.tar.gz",
         :configure => '',
-        :make => "TARGET=linux26"
-
+        :make => "make TARGET=linux26"
       }
       
       desc "Install haproxy"

data/lib/deprec/recipes/heartbeat.rb

@@ -30,7 +30,10 @@ Capistrano::Configuration.instance(:must_exist).load do
          
       # Install dependencies for heartbeat
       task :install_deps do
-        apt.install( {:base => %w(heartbeat-2)}, :stable )
+        apt.install( {:base => %w(heartbeat)}, :stable )
+        config
+        activate
+        start
       end
       
       SYSTEM_CONFIG_FILES[:heartbeat] = [
@@ -135,4 +138,4 @@ Capistrano::Configuration.instance(:must_exist).load do
           
     end
   end
-end
+end

data/lib/deprec/recipes/monit.rb

@@ -30,8 +30,8 @@ Capistrano::Configuration.instance(:must_exist).load do
   # Upstream changes: http://www.tildeslash.com/monit/dist/CHANGES.txt  
   # Ubuntu package version = monit-4.8.1  
   SRC_PACKAGES[:monit] = {
-    :md5sum => "4bbd3845ae1cbab13ec211824e0486dc  monit-5.1.1.tar.gz", 
-    :url => "http://mmonit.com/monit/dist/monit-5.1.1.tar.gz"
+    :md5sum => "2772b6f5ad46eb0f73f13e12a26267e1  monit-5.2.3.tar.gz",
+    :url => "http://mmonit.com/monit/dist/monit-5.2.3.tar.gz"
   }
   
   desc "Install monit"

data/lib/deprec/recipes/nagios.rb

@@ -25,7 +25,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         install
         top.deprec.nagios_plugins.install
         top.deprec.nrpe.install
-        config_gen
         config
       end
       
@@ -46,7 +45,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       # Install dependencies for nagios
       task :install_deps, :roles => :nagios do
-        apt.install( {:base => %w(apache2 mailx postfix libapache2-mod-php5 libgd2-xpm-dev)}, :stable )
+        apt.install( {:base => %w(apache2 mailutils postfix libapache2-mod-php5 libgd2-xpm-dev)}, :stable )
       end
       
       task :create_nagios_user, :roles => :nagios do

data/lib/deprec/recipes/postfix.rb

@@ -13,9 +13,9 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       # Install dependencies for Postfix
       task :install_deps, :roles => :mail do
-        # mutt and mailx are useful tools for testing mail
+        # mutt and mailutils are useful tools for testing mail
         # e.g. echo test | mail test@gmail.com
-        apt.install( {:base => %w(postfix mutt mailx)}, :stable )
+        apt.install( {:base => %w(postfix mutt mailutils)}, :stable )
       end
       
       # This is my default Postfix setup on servers that 
@@ -112,4 +112,4 @@ end
 #   end
 # 
 #   end end
-# end
+# end

data/lib/deprec/recipes/ubuntu.rb

@@ -15,7 +15,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
       desc "reboot the server"
-      task :restart do
+      task :restart do # we like standard names
+        reboot
+      end
+
+      # Because I end up typing it...
+      task :reboot do
         sudo "reboot"
       end
       

data/lib/deprec/recipes_minus_rails.rb

@@ -10,16 +10,16 @@ require "#{File.dirname(__FILE__)}/recipes/deprecated"
 require "#{File.dirname(__FILE__)}/recipes/ec2"
 require "#{File.dirname(__FILE__)}/recipes/vmware_tools"
 
-require "#{File.dirname(__FILE__)}/recipes/app/mongrel"
-require "#{File.dirname(__FILE__)}/recipes/app/passenger"
-require "#{File.dirname(__FILE__)}/recipes/db/mysql"
-require "#{File.dirname(__FILE__)}/recipes/db/postgresql"
-require "#{File.dirname(__FILE__)}/recipes/db/sqlite"
-require "#{File.dirname(__FILE__)}/recipes/db/couchdb"
-require "#{File.dirname(__FILE__)}/recipes/ruby/mri"
-require "#{File.dirname(__FILE__)}/recipes/ruby/ree"
-require "#{File.dirname(__FILE__)}/recipes/web/apache"
-require "#{File.dirname(__FILE__)}/recipes/web/nginx"
+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/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/git"

data/lib/deprec/templates/apache/default.erb

@@ -0,0 +1,85 @@
+<VirtualHost *:80>
+	ServerAdmin webmaster@localhost
+
+	DocumentRoot /var/www
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /var/www/>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+		Order allow,deny
+		allow from all
+	</Directory>
+
+	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+	<Directory "/usr/lib/cgi-bin">
+		AllowOverride None
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	ErrorLog /var/log/apache2/error.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+  CustomLog /var/log/apache2/access.log combined
+
+  # Uncomment this to exclude entries from logs
+  # # Mark requests for the check.txt file
+  # SetEnvIf Request_URI "^/check\.txt$" dontlog
+  # # Log what remains
+  # CustomLog /var/log/apache2/access.log combined env=!dontlog
+
+    Alias /doc/ "/usr/share/doc/"
+    <Directory "/usr/share/doc/">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.0/255.0.0.0 ::1/128
+    </Directory>
+
+
+<IfModule mod_deflate.c>
+# Insert filter
+SetOutputFilter DEFLATE
+
+# Netscape 4.x has some problems...
+BrowserMatch ^Mozilla/4 gzip-only-text/html
+
+# Netscape 4.06-4.08 have some more problems
+BrowserMatch ^Mozilla/4\.0[678] no-gzip
+
+# NOTE: Due to a bug in mod_setenvif up to Apache 2.0.48
+# the above regex won't work. You can use the following
+# workaround to get the desired effect:
+BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html
+
+# Don't compress images
+SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png|ico)$ no-gzip
+SetEnvIfNoCase Request_URI latentsee no-gzip
+</IfModule>
+
+<IfModule mod_rewrite.c>
+RewriteEngine on
+RewriteRule ^(.*)\.(\d+)(_m_\d+)?\.([^\.]+)$	$1.$4	[L,QSA]
+</IfModule>
+
+<IfModule mod_expires.c>
+ExpiresActive On
+ExpiresByType image/png "access plus 1 year"
+ExpiresByType image/gif "access plus 1 year"
+ExpiresByType image/jpeg "access plus 1 year"
+ExpiresByType image/vnd.microsoft.icon "access plus 1 year"
+ExpiresByType text/css "access plus 1 year"
+ExpiresByType application/x-javascript "access plus 1 year"
+ExpiresByType application/javascript "access plus 1 year"
+ExpiresByType text/javascript "access plus 1 year"
+</IfModule>
+
+</VirtualHost>

data/lib/deprec/templates/apache/vhost.erb

@@ -0,0 +1,48 @@
+<VirtualHost *:80>
+  ServerName <%= apache_vhost_domain %>
+<% apache_vhost_server_alii.each do |server_alias| -%>
+  ServerAlias <%= server_alias %>
+<% end -%>
+
+<% if apache_vhost_canonicalize_hostname -%>
+  # Redirect to canonical hostname
+  RewriteEngine On
+  RewriteCond %{HTTP_HOST}   !^<%= apache_vhost_domain.sub('.','\.') %> [NC]
+  RewriteCond %{HTTP_HOST}   !^$
+  RewriteRule ^/?(.*)         http://<%= apache_vhost_domain %>/$1 [L,R=301,NE]
+<% end -%>
+
+  DocumentRoot <%= "#{apache_vhost_document_root}" %>
+
+  ErrorLog <%= apache_vhost_error_log %>
+  CustomLog <%= apache_vhost_access_log %> <%= apache_vhost_access_log_type %>
+
+<% if apache_vhost_rack_env -%>
+  RackEnv <%= apache_vhost_rack_env %>
+<% end -%>
+
+  <Directory <%= "#{apache_vhost_document_root}" %>>
+    DirectoryIndex index.html index.htm index.php
+    Options FollowSymLinks
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+  </Directory>
+
+  RewriteEngine On
+
+  # Prevent access to .svn directories
+  RewriteRule ^(.*/)?\.svn/ - [F,L]
+  ErrorDocument 403 "Access Forbidden"
+
+  # Prevent access to .git directories
+  RewriteRule ^(.*/)?\.git/ - [F,L]
+  ErrorDocument 403 "Access Forbidden"
+  
+  # Deflate
+  AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript
+  BrowserMatch ^Mozilla/4 gzip-only-text/html
+  BrowserMatch ^Mozilla/4\.0[678] no-gzip
+  BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+
+</VirtualHost>

data/lib/deprec/templates/network/hostname.erb

@@ -1 +1 @@
-<%= network_hostname %>
+<%= network_hostname.split('.').first %>

data/lib/deprec/templates/network/hosts.erb

@@ -1,2 +1,2 @@
 127.0.0.1       localhost
-127.0.1.1       <%= network_hostname %>
+127.0.1.1       <%= network_hostname %> <%= network_hostname.split('.').first if network_hostname.match('\.') %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deprec
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 2
   - 1
-  - 18
-  version: 2.1.18
+  - 19
+  version: 2.1.19
 platform: ruby
 authors: 
 - Mike Bailey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +11:00
+date: 2011-03-06 00:00:00 +11:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,43 +80,43 @@ files:
 - lib/deprec/recipes/ddclient.rb
 - lib/deprec/recipes/wpmu.rb
 - lib/deprec/recipes/collectd.rb
-- lib/deprec/recipes/db/couchdb.rb
-- lib/deprec/recipes/db/sqlite.rb
-- lib/deprec/recipes/db/mysql.rb
-- lib/deprec/recipes/db/postgresql.rb
 - lib/deprec/recipes/ntp.rb
 - lib/deprec/recipes/ssh.rb
 - lib/deprec/recipes/bash.rb
 - lib/deprec/recipes/vmware_tools.rb
+- lib/deprec/recipes/nginx.rb
 - lib/deprec/recipes/logrotate.rb
 - lib/deprec/recipes/starling.rb
+- lib/deprec/recipes/couchdb.rb
 - lib/deprec/recipes/lvm.rb
-- lib/deprec/recipes/app/mongrel.rb
-- lib/deprec/recipes/app/passenger.rb
 - lib/deprec/recipes/syslog.rb
 - lib/deprec/recipes/utils.rb
 - lib/deprec/recipes/php.rb
 - lib/deprec/recipes/canonical.rb
-- lib/deprec/recipes/ruby/ree.rb
-- lib/deprec/recipes/ruby/mri.rb
+- lib/deprec/recipes/mongrel.rb
 - lib/deprec/recipes/heartbeat.rb
+- lib/deprec/recipes/passenger.rb
+- lib/deprec/recipes/sqlite.rb
 - lib/deprec/recipes/ar_sendmail.rb
 - lib/deprec/recipes/trac.rb
-- lib/deprec/recipes/web/nginx.rb
-- lib/deprec/recipes/web/apache.rb
 - lib/deprec/recipes/rails.rb
 - lib/deprec/recipes/memcache.rb
 - lib/deprec/recipes/xen.rb
 - lib/deprec/recipes/vnstat.rb
 - lib/deprec/recipes/ubuntu.rb
+- lib/deprec/recipes/ree.rb
 - lib/deprec/recipes/syslog_ng.rb
+- lib/deprec/recipes/mysql.rb
 - lib/deprec/recipes/ec2.rb
 - lib/deprec/recipes/sphinx.rb
 - lib/deprec/recipes/monit.rb
 - lib/deprec/recipes/ssl.rb
+- lib/deprec/recipes/postgresql.rb
 - lib/deprec/recipes/gitosis.rb
+- lib/deprec/recipes/mri.rb
 - lib/deprec/recipes/git.rb
 - lib/deprec/recipes/nagios.rb
+- lib/deprec/recipes/apache.rb
 - lib/deprec/recipes/svn.rb
 - lib/deprec/recipes/users.rb
 - lib/deprec/recipes/wordpress.rb
@@ -205,6 +205,8 @@ files:
 - lib/deprec/templates/apache/ports.conf.erb
 - lib/deprec/templates/apache/apache2.conf.erb
 - lib/deprec/templates/apache/namevirtualhosts.conf
+- lib/deprec/templates/apache/vhost.erb
+- lib/deprec/templates/apache/default.erb
 - lib/deprec/templates/deprec/caprc.erb
 - lib/deprec/templates/collectd/collectd.conf.erb
 - lib/deprec/templates/collectd/collectd-init.d
@@ -285,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: deprec
-rubygems_version: 1.4.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: deployment recipes for capistrano