deprec 2.1.11 → 2.1.12

data/lib/deprec/capistrano_extensions.rb

@@ -240,26 +240,26 @@ module Deprec2
     mkdir(src_dir, :mode => 0775, :group => group_src, :via => :sudo)
   end
   
-  # download source package if we don't already have it
-  def download_src(src_package, src_dir)
-    set_package_defaults(src_package)
+  # download source pkg if we don't already have it
+  def download_src(src_pkg, src_dir)
+    set_pkg_defaults(src_pkg)
     create_src_dir
     # check if file exists and if we have an MD5 hash or bytecount to compare 
     # against if so, compare and decide if we need to download again
-    if defined?(src_package[:md5sum])
-      md5_clause = " && echo '#{src_package[:md5sum]}' | md5sum -c - "
+    if defined?(src_pkg[:md5sum])
+      md5_clause = " && echo '#{src_pkg[:md5sum]}' | md5sum -c - "
     end
-    case src_package[:download_method]
+    case src_pkg[:download_method]
       # when getting source with git
       when :git
         # ensure git is installed
         apt.install( {:base => %w(git-core)}, :stable) #TODO fix this to test ubuntu version <hardy might need specific git version for full git submodules support
-        package_dir = File.join(src_dir, src_package[:dir])
-        run "if [ -d #{package_dir} ]; then cd #{package_dir} && #{sudo} git checkout master && #{sudo} git pull && #{sudo} git submodule init && #{sudo} git submodule update; else #{sudo} git clone #{src_package[:url]} #{package_dir} && cd #{package_dir} && #{sudo} git submodule init && #{sudo} git submodule update ; fi"
+        pkg_dir = File.join(src_dir, src_pkg[:dir])
+        run "if [ -d #{pkg_dir} ]; then cd #{pkg_dir} && #{sudo} git checkout master && #{sudo} git pull && #{sudo} git submodule init && #{sudo} git submodule update; else #{sudo} git clone #{src_pkg[:url]} #{pkg_dir} && cd #{pkg_dir} && #{sudo} git submodule init && #{sudo} git submodule update ; fi"
       	# Checkout the revision wanted if defined
-      	if src_package[:version]
-      	  run "cd #{package_dir} && git branch | grep '#{src_package[:version]}$' && #{sudo} git branch -D '#{src_package[:version]}'; exit 0"
-      	  run "cd #{package_dir} && #{sudo} git checkout -b #{src_package[:version]} #{src_package[:version]}" 
+      	if src_pkg[:version]
+      	  run "cd #{pkg_dir} && git branch | grep '#{src_pkg[:version]}$' && #{sudo} git branch -D '#{src_pkg[:version]}'; exit 0"
+      	  run "cd #{pkg_dir} && #{sudo} git checkout -b #{src_pkg[:version]} #{src_pkg[:version]}" 
         end
 	
       # when getting source with wget    
@@ -267,66 +267,67 @@ module Deprec2
         # ensure wget is installed
         apt.install( {:base => %w(wget)}, :stable )
         # XXX replace with invoke_command
-        run "cd #{src_dir} && test -f #{src_package[:filename]} #{md5_clause} || #{sudo} wget --quiet --timestamping #{src_package[:url]}"
+        run "cd #{src_dir} && test -f #{src_pkg[:filename]} #{md5_clause} || #{sudo} wget --quiet --timestamping #{src_pkg[:url]}"
+
+      when :deb
+        run "cd #{src_dir} && test -f #{src_pkg[:filename]} #{md5_clause} || #{sudo} wget --quiet --timestamping #{src_pkg[:url]}"
+
       else
-        puts "DOWNLOAD SRC: Download method not recognised. src_package[:download_method]: #{src_package[:download_method]}"
+        puts "DOWNLOAD SRC: Download method not recognised. src_pkg[:download_method]: #{src_pkg[:download_method]}"
     end
   end
 
   # unpack src and make it writable by the group
-  def unpack_src(src_package, src_dir)
-    set_package_defaults(src_package)
-    package_dir = File.join(src_dir, src_package[:dir])
-    case src_package[:download_method]
+  def unpack_src(src_pkg, src_dir)
+    set_pkg_defaults(src_pkg)
+    pkg_dir = File.join([src_dir, src_pkg[:dir]].compact)
+    case src_pkg[:download_method]
       # when unpacking git sources - nothing to do
+      when :deb
+        puts "UNPACK SRC: nothing to do for deb installs"
       when :git
         puts "UNPACK SRC: nothing to do for git installs"
       when :http
-        sudo <<-EOF
-        bash -c '
-        cd #{src_dir};
-        test -d #{package_dir}.old && rm -fr #{package_dir}.old;
-        test -d #{package_dir} && mv #{package_dir} #{package_dir}.old;
-        #{src_package[:unpack]}
-        '
-        EOF
+        run "test -d #{pkg_dir}.old && #{sudo} rm -fr #{pkg_dir}.old; exit 0"
+        run "test -d #{pkg_dir} && #{sudo} mv #{pkg_dir} #{pkg_dir}.old; exit 0"
+        run "cd #{src_dir} && #{sudo} #{src_pkg[:unpack]}" if src_pkg[:unpack] != ''
+        run "#{sudo} chgrp -R #{group} #{pkg_dir}"
+        run "#{sudo} chmod -R g+w #{pkg_dir}"
       else
-        puts "UNPACK SRC: Download method not recognised. src_package[:download_method]: #{src_package[:download_method]} "
+        puts "UNPACK SRC: Download method not recognised. src_pkg[:download_method]: #{src_pkg[:download_method]} "
     end
-    sudo <<-EOF
-    bash -c '
-    cd #{src_dir};
-    chgrp -R #{group} #{package_dir};  
-    chmod -R g+w #{package_dir};
-    '
-    EOF
   end
 
-  def set_package_defaults(pkg)
+  def set_pkg_defaults(pkg)
     pkg[:filename] ||= File.basename(pkg[:url])
-    pkg[:dir] ||= pkg[:filename].sub(/(\.tgz|\.tar\.gz)/,'')
     pkg[:download_method] ||= :http
-    pkg[:unpack] ||= "tar zxf #{pkg[:filename]};"
-    pkg[:configure] ||= './configure ;'
-    pkg[:make] ||= 'make;'
-    pkg[:install] ||= 'make install;'
+    pkg[:post_install] ||= ''
+    case pkg[:download_method]
+    when :http
+      pkg[:dir] ||= pkg[:filename].sub(/(\.tgz|\.tar\.gz)/,'')
+      pkg[:unpack] ||= "tar zxf #{pkg[:filename]};"
+      pkg[:configure] ||= './configure ;'
+      pkg[:make] ||= 'make;'
+      pkg[:install] ||= 'make install;'
+    when :deb
+      pkg[:dir] ||= ''
+      pkg[:unpack] ||= ''
+      pkg[:configure] ||= ''
+      pkg[:make] ||= ''
+      pkg[:install] ||= "dpkg -i #{pkg[:filename]}"
+    end
   end
 
-  # install package from source
-  def install_from_src(src_package, src_dir)
-    set_package_defaults(src_package)
-    package_dir = File.join(src_dir, src_package[:dir])
-    unpack_src(src_package, src_dir)
+  # install pkg from source
+  def install_from_src(src_pkg, src_dir)
+    set_pkg_defaults(src_pkg)
+    pkg_dir = File.join([src_dir, src_pkg[:dir]].compact)
+    unpack_src(src_pkg, src_dir)
     apt.install( {:base => %w(build-essential)}, :stable )
-    sudo <<-SUDO
-    sh -c '
-    cd #{package_dir};
-    #{src_package[:configure]}
-    #{src_package[:make]}
-    #{src_package[:install]}
-    #{src_package[:post_install]}
-    '
-    SUDO
+    run "cd #{pkg_dir} && #{sudo} #{src_pkg[:configure]}" if src_pkg[:configure] != ''
+    run "cd #{pkg_dir} && #{sudo} #{src_pkg[:make]}" if src_pkg[:make] != ''
+    run "cd #{pkg_dir} && #{sudo} #{src_pkg[:install]}" if src_pkg[:install] != ''
+    run "cd #{pkg_dir} && #{sudo} #{src_pkg[:post_install]}" if src_pkg[:post_install] != ''
   end
   
   def read_database_yml

data/lib/deprec/recipes/app/passenger.rb

@@ -3,7 +3,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do 
     namespace :passenger do
 
-      set :passenger_version, '2.2.13'    
+      set :passenger_version, '2.2.14'    
       set :passenger_install_dir, "/usr/local/lib/ruby/gems/1.8/gems/passenger-#{passenger_version}"
    
       # Default settings for Passenger config files

data/lib/deprec/recipes/db/sqlite.rb

@@ -3,15 +3,24 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do 
     namespace :sqlite do
 
+      SRC_PACKAGES[:sqlite] = {
+        :url => "http://www.sqlite.org/sqlite-amalgamation-3.7.2.tar.gz",
+        :md5sum => "bd9586208f48ba840467bcfd066a6fa9  sqlite-amalgamation-3.7.2.tar.gz",
+        :dir => 'sqlite-3.7.2'
+      }
+
+
       desc "Install sqlite"
       task :install, :roles => :db do
         install_deps
+        deprec2.download_src(SRC_PACKAGES[:sqlite], src_dir)
+        deprec2.install_from_src(SRC_PACKAGES[:sqlite], src_dir)
         gem2.install "sqlite3-ruby"
       end
 
       # install dependencies for nginx
       task :install_deps, :roles => :db do
-        apt.install( {:base => %w(sqlite3 libsqlite3-ruby libsqlite3-dev)}, :stable )
+        # apt.install( {:base => %w(blah)}, :stable )
       end
     end
     
@@ -34,4 +43,4 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
     
   end
-end
+end

data/lib/deprec/recipes/network.rb

@@ -101,6 +101,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       # XXX need to set the order for these as it breaks sudo currently
       desc "Update system networking configuration"
       task :config do
+        network_hostname # get user input upfront
         SYSTEM_CONFIG_FILES[:network].values.each do |file|
           deprec2.render_template(:network, file.merge(:remote=>true))
         end

data/lib/deprec/recipes/rails.rb

@@ -43,21 +43,18 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   after :deploy, "deploy:cleanup"
   
-  namespace :rake do
-    namespace :gems do
-      task :install, :roles => :app do
-        run "cd #{current_path} && #{sudo} rake gems:install"
-      end
-    end
-  end
-  namespace :db do
-    task :migrate, :roles => :db do
-      run "cd #{current_path} && #{sudo} rake gems:install"
-    end
-  end
-  
   namespace :deprec do
     namespace :rails do
+
+      task :install, :roles => :app do
+        install_deps
+        gem2.install 'rails'
+        gem2.install 'bundler'
+      end
+
+      task :install_deps do
+        apt.install( {:base => %w(libmysqlclient15-dev sqlite3 libsqlite3-ruby libsqlite3-dev libpq-dev)}, :stable )
+      end
       
       #
       # If database.yml is not kept in scm and it is present in local
@@ -76,25 +73,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
       
-      task :install, :roles => :app do
-        install_deps
-        install_gems
-      end
-
-      task :install_deps do
-        apt.install( {:base => %w(libmysqlclient15-dev sqlite3 libsqlite3-ruby libsqlite3-dev libpq-dev)}, :stable )
-      end
-      
-      # install some required ruby gems
-      task :install_gems do
-        gem2.install 'sqlite3-ruby'
-        gem2.install 'mysql'
-        gem2.install 'ruby-pg'
-        gem2.install 'rails'
-        gem2.install 'rake'
-        gem2.install 'rspec'
-      end
-      
       desc <<-DESC
       Install full rails stack on a stock standard ubuntu server (7.10, 8.04)
       DESC

data/lib/deprec/recipes/ruby/ree.rb

@@ -3,15 +3,12 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do     
     namespace :ree do
 
-      set :ree_version, 'ruby-enterprise-1.8.7-2010.02'
       set :ree_install_dir, "/usr/local"
       
       SRC_PACKAGES[:ree] = {
-        :md5sum => "4df7b09c01adfd711b0ab76837611542 #{ree_version}.tar.gz",
-        :url => "http://rubyforge.org/frs/download.php/71096/#{ree_version}.tar.gz",
-        :configure => '',
-        :make => '',
-        :install => "./installer --auto #{ree_install_dir}"
+        :md5sum => "0eaff4bcd0bc9fa310c593be7ae33937  ruby-enterprise_1.8.7-2010.02_amd64_ubuntu8.04.deb",
+        :url => "http://rubyforge.org/frs/download.php/71097/ruby-enterprise_1.8.7-2010.02_amd64_ubuntu8.04.deb",
+        :download_method => :deb
       }
  
       task :install do
@@ -22,7 +19,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
       task :install_deps do
-        apt.install({:base => %w(libssl-dev libmysqlclient15-dev libreadline5-dev)}, :stable)
+        # not required with new dev package?
+        # apt.install({:base => %w(libssl-dev libmysqlclient15-dev libreadline5-dev)}, :stable)
       end
       
     end

data/lib/deprec/recipes/syslog_ng.rb

@@ -9,10 +9,24 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       }
       set :syslog_ng_loghost_port, 514
+
+      desc "Setup server"
+      task :server_setup do
+        install_deps
+        deprec2.render_template(
+          :syslog_ng, 
+          :template => 'syslog-ng.conf-server',
+          :path => '/etc/syslog-ng/syslog-ng.conf',
+          :mode => 0644,
+          :owner => 'root:root',
+          :remote => true
+        )
+        restart
+      end
             
       desc "Install syslog-ng"
       task :install do
-        syslog_ng_loghost_name
+        syslog_ng_loghost_name # get user input at beginning
         install_deps
         config
       end

data/lib/deprec/recipes/web/apache.rb

@@ -26,6 +26,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       SYSTEM_CONFIG_FILES[:apache] = [
         
+        { :template => 'apache2.conf.erb',
+          :path => '/etc/apache2/apache2.conf',
+          :mode => 0644,
+          :owner => 'root:root'},
+
         { :template => 'namevirtualhosts.conf',
           :path => '/etc/apache2/conf.d/namevirtualhosts.conf',
           :mode => 0644,

data/lib/deprec/templates/apache/apache2.conf.erb

@@ -0,0 +1,295 @@
+#
+# Based upon the NCSA server configuration files originally by Rob McCool.
+#
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See http://httpd.apache.org/docs/2.2/ for detailed information about
+# the directives.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# The configuration directives are grouped into three basic sections:
+#  1. Directives that control the operation of the Apache server process as a
+#     whole (the 'global environment').
+#  2. Directives that define the parameters of the 'main' or 'default' server,
+#     which responds to requests that aren't handled by a virtual host.
+#     These directives also provide default values for the settings
+#     of all virtual hosts.
+#  3. Settings for virtual hosts, which allow Web requests to be sent to
+#     different IP addresses or hostnames and have them handled by the
+#     same Apache server process.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "/var/log/apache2/foo.log"
+# with ServerRoot set to "" will be interpreted by the
+# server as "//var/log/apache2/foo.log".
+#
+
+### Section 1: Global Environment
+#
+# The directives in this section affect the overall operation of Apache,
+# such as the number of concurrent requests it can handle or where it
+# can find its configuration files.
+#
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the LockFile documentation (available
+# at <URL:http://httpd.apache.org/docs-2.1/mod/mpm_common.html#lockfile>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+ServerRoot "/etc/apache2"
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+#<IfModule !mpm_winnt.c>
+#<IfModule !mpm_netware.c>
+LockFile /var/lock/apache2/accept.lock
+#</IfModule>
+#</IfModule>
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+#
+PidFile /var/run/apache2.pid
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 15
+
+##
+## Server-Pool Size Regulation (MPM specific)
+## 
+
+# prefork MPM
+# StartServers: number of server processes to start
+# MinSpareServers: minimum number of server processes which are kept spare
+# MaxSpareServers: maximum number of server processes which are kept spare
+# MaxClients: maximum number of server processes allowed to start
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule mpm_prefork_module>
+    StartServers          5
+    MinSpareServers       5
+    MaxSpareServers      10
+    MaxClients          150
+    MaxRequestsPerChild   0
+</IfModule>
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule mpm_worker_module>
+    StartServers          2
+    MaxClients          150
+    MinSpareThreads      25
+    MaxSpareThreads      75 
+    ThreadsPerChild      25
+    MaxRequestsPerChild   0
+</IfModule>
+
+User www-data
+Group www-data
+
+#
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ~ "^\.ht">
+    Order allow,deny
+    Deny from all
+</Files>
+
+#
+# DefaultType is the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog /var/log/apache2/error.log
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+# Include module configuration:
+Include /etc/apache2/mods-enabled/*.load
+Include /etc/apache2/mods-enabled/*.conf
+
+# Include all the user configurations:
+Include /etc/apache2/httpd.conf
+
+# Include ports listing
+Include /etc/apache2/ports.conf
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
+#
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+#
+# ServerTokens
+# This directive configures what you return as the Server HTTP response
+# Header. The default is 'Full' which sends information about the OS-Type
+# and compiled in modules.
+# Set to one of:  Full | OS | Minor | Minimal | Major | Prod
+# where Full conveys the most information, and Prod the least.
+#
+ServerTokens Full
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory 
+# listings, mod_status and mod_info output etc., but not CGI generated 
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+ServerSignature On
+
+
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# Putting this all together, we can internationalize error responses.
+#
+# We use Alias to redirect any /error/HTTP_<error>.html.var response to
+# our collection of by-error message multi-language collections.  We use 
+# includes to substitute the appropriate text.
+#
+# You can modify the messages' appearance without changing any of the
+# default HTTP_<error>.html.var files by adding the line:
+#
+#   Alias /error/include/ "/your/include/path/"
+#
+# which allows you to create your own set of files by starting with the
+# /usr/share/apache2/error/include/ files and copying them to /your/include/path/, 
+# even on a per-VirtualHost basis.  The default include files will display
+# your Apache version number and your ServerAdmin email address regardless
+# of the setting of ServerSignature.
+#
+# The internationalized error documents require mod_alias, mod_include
+# and mod_negotiation.  To activate them, uncomment the following 30 lines.
+
+#    Alias /error/ "/usr/share/apache2/error/"
+#
+#    <Directory "/usr/share/apache2/error">
+#        AllowOverride None
+#        Options IncludesNoExec
+#        AddOutputFilter Includes html
+#        AddHandler type-map var
+#        Order allow,deny
+#        Allow from all
+#        LanguagePriority en cs de es fr it nl sv pt-br ro
+#        ForceLanguagePriority Prefer Fallback
+#    </Directory>
+#
+#    ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+#    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+#    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+#    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+#    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+#    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+#    ErrorDocument 410 /error/HTTP_GONE.html.var
+#    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+#    ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+#    ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+#    ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+#    ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+#    ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+#    ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+#    ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+#    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+#    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+
+
+
+# Include of directories ignores editors' and dpkg's backup files,
+# see README.Debian for details.
+
+# Include generic snippets of statements
+Include /etc/apache2/conf.d/
+
+# Include the virtual host configurations:
+Include /etc/apache2/sites-enabled/

data/lib/deprec/templates/syslog_ng/syslog-ng.conf-client

@@ -97,10 +97,6 @@ source s_all {
 ######
 # destinations
 
-<% if syslog_ng_loghost_name and syslog_ng_loghost_name.to_s != '' %>
-destination loghost { tcp("<%= syslog_ng_loghost_name %>" port (<%= syslog_ng_loghost_port %>)); };
-<% end %>
-
 # some standard log files
 destination df_auth { file("/var/log/auth.log"); };
 destination df_syslog { file("/var/log/syslog"); };
@@ -199,17 +195,6 @@ filter f_xconsole {
 
 # these rules provide the same behavior as the commented original syslogd rules
 
-
-<% if syslog_ng_loghost_name and syslog_ng_loghost_name.to_s != '' %>
-# Send to loghost
-log {
-  source(s_all);
-  # filter(notdebug);
-  destination(loghost);
-};
-<% end %>
-
-
 # auth,authpriv.*                 /var/log/auth.log
 log {
         source(s_all);
@@ -361,3 +346,10 @@ log {
         destination(dp_xconsole);
 };
 
+<% if syslog_ng_loghost_name and syslog_ng_loghost_name.to_s != '' %>
+# Send all logs to loghost
+
+destination loghost { tcp("<%= syslog_ng_loghost_name %>" port (<%= syslog_ng_loghost_port %>)); };
+log { source(s_all); destination(loghost); };
+
+<% end %>

data/lib/vmbuilder_plugins/gem.rb

@@ -52,7 +52,7 @@ module Gem
   # +packages+ can be a single string or an array of strings.
   #  
   def install(packages, version=nil)
-    send(run_method,"#{GEM_INSTALL} #{if version then '-v '+version.to_s end} #{packages.to_a.join(' ')}")
+    send(run_method,"#{GEM_INSTALL} #{if version then '-v '+version.to_s end} #{Array(packages).join(' ')}")
   end
 
   # Auto selects a gem from a list and installs it.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 1
-  - 11
-  version: 2.1.11
+  - 12
+  version: 2.1.12
 platform: ruby
 authors: 
 - Mike Bailey
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +10:00
+date: 2010-09-17 00:00:00 +10:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -198,6 +198,7 @@ files:
 - lib/deprec/templates/subversion/svn.apache.vhost.erb
 - lib/deprec/templates/apache/status.conf.erb
 - lib/deprec/templates/apache/ports.conf.erb
+- lib/deprec/templates/apache/apache2.conf.erb
 - lib/deprec/templates/apache/namevirtualhosts.conf
 - lib/deprec/templates/deprec/caprc.erb
 - lib/deprec/templates/collectd/collectd.conf.erb