syncwrap 1.2.1 → 1.3.0

data/History.rdoc

@@ -1,3 +1,17 @@
+=== 1.3.0 (2012-10-4)
+* Include RHEL/Amazon Linux Postgresql 9.1 config and deploy support
+  and reorganize for Ubuntu support as well. Default deploy data dir
+  is now /pg/data which makes sense for an EBS mount. Config is
+  further tuned for EBS.  PostgreSQL::EC2 has been dropped.
+  PostgreSQL::RHEL and PostgreSQL::Ubuntu are auto-included with
+  PostgreSQL module if RHEL or Ubuntu is included.
+* For performance on relatively slow virtual hosts, only check
+  iyyov_install if iyyov_install_jobs( :install => true )
+* Add generic etc/gemrc and jruby_install_gemrc (incl in jruby_install)
+* Include jstat in list of java command symlinks with java_install
+* EC2.ec2_reformat_mnt_as_ext is for ephemoral not EBS, rename
+  attribute to ec2_es_device
+
 === 1.2.1 (2012-9-25)
 * Build hashdot with java 1.7.0_07 as well
 * Fix lib jruby link on update: --no-dereference

data/Manifest.txt

@@ -2,13 +2,9 @@ History.rdoc
 Manifest.txt
 README.rdoc
 Rakefile
+etc/gemrc
 etc/init.d/iyyov
-etc/postgresql/9.1/main/environment
-etc/postgresql/9.1/main/pg_ctl.conf
-etc/postgresql/9.1/main/pg_hba.conf
-etc/postgresql/9.1/main/pg_ident.conf
-etc/postgresql/9.1/main/postgresql.conf
-etc/postgresql/9.1/main/start.conf
+etc/sysconfig/pgsql/postgresql
 etc/sysctl.d/61-postgresql-shm.conf
 lib/syncwrap/base.rb
 lib/syncwrap.rb
@@ -25,6 +21,15 @@ lib/syncwrap/remote_task.rb
 lib/syncwrap/rhel.rb
 lib/syncwrap/ubuntu.rb
 lib/syncwrap/user_run.rb
+postgresql/rhel/pg_hba.conf
+postgresql/rhel/pg_ident.conf
+postgresql/rhel/postgresql.conf
+postgresql/ubuntu/environment
+postgresql/ubuntu/pg_ctl.conf
+postgresql/ubuntu/pg_hba.conf
+postgresql/ubuntu/pg_ident.conf
+postgresql/ubuntu/postgresql.conf
+postgresql/ubuntu/start.conf
 test/test_syncwrap.rb
 usr/local/bin/jgem
 var/iyyov/jobs.rb

data/Rakefile

@@ -60,8 +60,6 @@ class SyncWrapper
     desc "Deploy PostgreSQL"
     remote_task :pg_deploy do
       pg_install
-      pg_stop
-      pg_adjust_sysctl
       pg_configure
       pg_start
     end

data/etc/gemrc

@@ -0,0 +1,11 @@
+---
+install: --no-ri --no-rdoc
+update:  --no-ri --no-rdoc
+:backtrace: false
+:benchmark: false
+:bulk_threshold: 1000
+:verbose: true
+:update_sources: true
+:sources:
+- http://rubygems.org/
+...

data/etc/sysconfig/pgsql/postgresql

@@ -0,0 +1,2 @@
+# Default
+PGDATA=/pg/data

data/lib/syncwrap/base.rb

@@ -15,5 +15,5 @@
 #++
 
 module SyncWrap
-  VERSION='1.2.1'
+  VERSION='1.3.0'
 end

data/lib/syncwrap/ec2.rb

@@ -20,27 +20,27 @@ require 'syncwrap/common'
 module SyncWrap::EC2
   include SyncWrap::Common
 
-  # The device name of the EBS device mounted on /mnt
+  # The device name of the ephemeral storage device
   # (default: 'xvdb')
-  attr_accessor :ec2_ebs_mnt_device
+  attr_accessor :ec2_es_device
 
   def initialize
     super
 
-    @ec2_ebs_mnt_device = 'xvdb'
+    @ec2_es_device = 'xvdb'
   end
 
   # WARNING: Destructive if run!
-  # Re-mkfs /mnt partition as ext4 if its ec2_ebs_mnt_device and is
+  # Re-mkfs /mnt partition as ext4 if its ec2_es_device and is
   # currently ext3
   def ec2_reformat_mnt_as_ext4
     rc = exec_conditional do
-      run "mount | grep '/dev/#{ec2_ebs_mnt_device} on /mnt'"
+      run "mount | grep '/dev/#{ec2_es_device} on /mnt'"
     end
-    raise "Device /dev/#{ec2_ebs_mnt_device} not mounted on /mnt" unless rc == 0
+    raise "Device /dev/#{ec2_es_device} not mounted on /mnt" unless rc == 0
 
     rc = exec_conditional do
-      run "mount | grep '/dev/#{ec2_ebs_mnt_device} on /mnt type ext3'"
+      run "mount | grep '/dev/#{ec2_es_device} on /mnt type ext3'"
     end
     ec2_reformat_mnt_as_ext4! if rc == 0
   end
@@ -51,7 +51,7 @@ module SyncWrap::EC2
   def ec2_reformat_mnt_as_ext4!
     sudo <<-SH
       umount /mnt
-      mkfs -t ext4 /dev/#{ec2_ebs_mnt_device}
+      mkfs -t ext4 /dev/#{ec2_es_device}
       mount  /mnt
     SH
   end

data/lib/syncwrap/iyyov.rb

@@ -37,14 +37,17 @@ module SyncWrap::Iyyov
   # for daemon gem or other setup, then finally update remote
   # (user_run) var/iyyov/jobs.rb; which will trigger any necessary
   # restarts.
-  def iyyov_install_jobs
+  # === Options
+  # :install:: If true, run iyyov_install first and make sure iyyov is
+  # running (default: false)
+  def iyyov_install_jobs( opts = {} )
     user_run_dir_setup
 
-    restart = iyyov_install
+    restart = opts[ :install ] && iyyov_install
     if restart
       iyyov_restart
       sleep 15
-    elsif !exist?( "#{iyyov_run_dir}/iyyov.pid" )
+    elsif opts[ :install ] && !exist?( "#{iyyov_run_dir}/iyyov.pid" )
       iyyov_start
       sleep 15
     end

data/lib/syncwrap/java.rb

@@ -47,7 +47,7 @@ module SyncWrap::Java
   end
 
   def java_install!
-    bins = %w[ java jmap jstack jps jinfo jhat javac ].
+    bins = %w[ java jmap jstack jstat jps jinfo jhat javac ].
       map { |b| "../lib/java/bin/#{b}" }.
       join( ' ' )
 

data/lib/syncwrap/jruby.rb

@@ -38,11 +38,22 @@ module SyncWrap::JRuby
     @jruby_gem_install_args = %w[ --no-rdoc --no-ri ]
   end
 
+  def jruby_gemrc_path
+    "#{common_prefix}/lib/jruby/jruby-#{jruby_version}/etc"
+  end
+
   # Install jruby if the jruby_version is not already present.
   def jruby_install
     unless exist?( "#{common_prefix}/lib/jruby/jruby-#{jruby_version}" )
       jruby_install!
     end
+    jruby_install_gemrc
+  end
+
+  # Install gemrc file to jruby_gemrc_path
+  def jruby_install_gemrc
+    sudo "mkdir -p #{jruby_gemrc_path}"
+    rput( 'etc/gemrc', jruby_gemrc_path, :user => 'root' )
   end
 
   # Install jruby, including usr/local/bin local contents

data/lib/syncwrap/postgresql.rb

@@ -15,24 +15,43 @@
 #++
 
 require 'syncwrap/distro'
+require 'syncwrap/ubuntu'
+require 'syncwrap/rhel'
 
 # Provisions for install and configuration of PostgreSQL
 module SyncWrap::PostgreSQL
   include SyncWrap::Distro
 
+  # Location of postgresql data dir (databases + config in default
+  # case)
+  attr_accessor :pg_data_dir
+
+  # The stock distribution default data_dir. Difference with
+  # pg_data_dir triggers additional install steps.
+  attr_accessor :pg_default_data_dir
+
+  # Local directory for configuration files (different by
+  # distribution)
+  attr_accessor :pg_deploy_config
+
   def initialize
     super
+    @pg_data_dir = '/pg/data'
   end
 
-  # Update PostgreSQL config files from local etc
-  def pg_configure
-    rput( 'etc/postgresql/9.1/main/', :user => 'postgres' )
+  def pg_config_dir
+    @pg_data_dir
   end
 
   def pg_install
     dist_install 'postgresql'
   end
 
+  # Update PostgreSQL config files
+  def pg_configure
+    rput( "#{pg_deploy_config}/", pg_config_dir, :user => 'postgres' )
+  end
+
   def pg_start
     dist_service( 'postgresql', 'start' )
   end
@@ -41,32 +60,72 @@ module SyncWrap::PostgreSQL
     dist_service( 'postgresql', 'stop' )
   end
 
-  def pg_adjust_sysctl
-    rput( 'etc/sysctl.d/61-postgresql-shm.conf', :user => 'root' )
-    sudo "sysctl -p /etc/sysctl.d/61-postgresql-shm.conf"
+  def self.included( base )
+    if base.include?( SyncWrap::RHEL )
+      base.send( :include, SyncWrap::PostgreSQL::RHEL )
+    elsif base.include?( SyncWrap::Ubuntu )
+      base.send( :include, SyncWrap::PostgreSQL::Ubuntu )
+    end
   end
 
-  module Ubuntu
-    include SyncWrap::PostgreSQL
+  module RHEL
 
     def initialize
       super
+      #Per Amazon Linux 2012 3.3
+      @pg_default_data_dir = '/var/lib/pgsql9/data'
+      @pg_deploy_config = 'postgresql/rhel'
+    end
+
+    def pg_install
+      super
+      unless @pg_data_dir == @pg_default_data_dir
+        # (Per Amazon Linux)
+        # Install PGDATA var override for init.d/postgresql
+        rput( 'etc/sysconfig/pgsql/postgresql', :user => 'root' )
+        sudo <<-SH
+          mkdir -p #{pg_data_dir}
+          chown postgres:postgres #{pg_data_dir}
+          chmod 700 #{pg_data_dir}
+        SH
+      end
+      dist_service( 'postgresql', 'initdb' )
     end
 
   end
 
-  module EC2
-    include SyncWrap::PostgreSQL
+  module Ubuntu
 
     def initialize
       super
+      @pg_default_data_dir = '/var/lib/postgresql/9.1/main'
+      @pg_deploy_config = 'postgresql/ubuntu'
+    end
+
+    def pg_install
+      super
+      pg_stop #Ubuntu does a start
+      pg_adjust_sysctl
+      pg_relocate unless @pg_data_dir == @pg_default_data_dir
+    end
+
+    def pg_config_dir
+      "/etc/postgresql/9.1/main"
+    end
+
+    def pg_adjust_sysctl
+      rput( 'etc/sysctl.d/61-postgresql-shm.conf', :user => 'root' )
+      sudo "sysctl -p /etc/sysctl.d/61-postgresql-shm.conf"
     end
 
+    # Move the data dir into its final location, since on Ubuntu the
+    # package install does the initdb step
     def pg_relocate
-      # FIXME: Different default location on RHEL?
       sudo <<-SH
-        mkdir -p /mnt/var/postgresql/
-        mv /var/lib/postgresql/9.1 /mnt/var/postgresql/
+        mkdir -p #{pg_data_dir}
+        chown postgres:postgres #{pg_data_dir}
+        chmod 700 #{pg_data_dir}
+        mv #{pg_default_data_dir}/* #{pg_data_dir}/
       SH
     end
 

data/lib/syncwrap/rhel.rb

@@ -29,11 +29,6 @@ module SyncWrap::RHEL
                          'postgresql' => 'postgresql-server' )
   end
 
-  # FIXME
-  # rpm -Uvh \
-  # http://linux.mirrors.es.net/fedora-epel/6/x86_64/ \
-  # epel-release-6-7.noarch.rpm
-
   def dist_install( *pkgs )
     pkgs = dist_map_packages( pkgs )
     sudo "yum install -q -y #{pkgs.join( ' ' )}"

data/postgresql/rhel/pg_hba.conf

@@ -0,0 +1,87 @@
+# PostgreSQL Client Authentication Configuration File
+# ===================================================
+#
+# Refer to the "Client Authentication" section in the PostgreSQL
+# documentation for a complete description of this file.  A short
+# synopsis follows.
+#
+# This file controls: which hosts are allowed to connect, how clients
+# are authenticated, which PostgreSQL user names they can use, which
+# databases they can access.  Records take one of these forms:
+#
+# local      DATABASE  USER  METHOD  [OPTIONS]
+# host       DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
+# hostssl    DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
+# hostnossl  DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
+#
+# (The uppercase items must be replaced by actual values.)
+#
+# The first field is the connection type: "local" is a Unix-domain
+# socket, "host" is either a plain or SSL-encrypted TCP/IP socket,
+# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a
+# plain TCP/IP socket.
+#
+# DATABASE can be "all", "sameuser", "samerole", "replication", a
+# database name, or a comma-separated list thereof. The "all"
+# keyword does not match "replication". Access to replication
+# must be enabled in a separate record (see example below).
+#
+# USER can be "all", a user name, a group name prefixed with "+", or a
+# comma-separated list thereof.  In both the DATABASE and USER fields
+# you can also write a file name prefixed with "@" to include names
+# from a separate file.
+#
+# ADDRESS specifies the set of hosts the record matches.  It can be a
+# host name, or it is made up of an IP address and a CIDR mask that is
+# an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that
+# specifies the number of significant bits in the mask.  A host name
+# that starts with a dot (.) matches a suffix of the actual host name.
+# Alternatively, you can write an IP address and netmask in separate
+# columns to specify the set of hosts.  Instead of a CIDR-address, you
+# can write "samehost" to match any of the server's own IP addresses,
+# or "samenet" to match any address in any subnet that the server is
+# directly connected to.
+#
+# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi",
+# "krb5", "ident", "peer", "pam", "ldap", "radius" or "cert".  Note that
+# "password" sends passwords in clear text; "md5" is preferred since
+# it sends encrypted passwords.
+#
+# OPTIONS are a set of options for the authentication in the format
+# NAME=VALUE.  The available options depend on the different
+# authentication methods -- refer to the "Client Authentication"
+# section in the documentation for a list of which options are
+# available for which authentication methods.
+#
+# Database and user names containing spaces, commas, quotes and other
+# special characters must be quoted.  Quoting one of the keywords
+# "all", "sameuser", "samerole" or "replication" makes the name lose
+# its special character, and just match a database or username with
+# that name.
+#
+# This file is read on server startup and when the postmaster receives
+# a SIGHUP signal.  If you edit the file on a running system, you have
+# to SIGHUP the postmaster for the changes to take effect.  You can
+# use "pg_ctl reload" to do that.
+
+# Put your actual configuration here
+# ----------------------------------
+#
+# If you want to allow non-local connections, you need to add more
+# "host" records.  In that case you will also need to make PostgreSQL
+# listen on a non-local interface via the listen_addresses
+# configuration parameter, or via the -i or -h command line switches.
+
+# TYPE  DATABASE        USER            ADDRESS                 METHOD
+
+# "local" is for Unix domain socket connections only
+local   all             all                                     peer
+# IPv4 local connections:
+host    all             all             127.0.0.1/32            trust
+# IPv6 local connections:
+host    all             all             ::1/128                 trust
+# Allow replication connections from localhost, by a user with the
+# replication privilege.
+#local   replication     postgres                                peer
+#host    replication     postgres        127.0.0.1/32            ident
+#host    replication     postgres        ::1/128                 ident

data/postgresql/rhel/postgresql.conf

@@ -0,0 +1,540 @@
+# -----------------------------
+# PostgreSQL configuration file
+# -----------------------------
+#
+# This file consists of lines of the form:
+#
+#   name = value
+#
+# (The "=" is optional.)  Whitespace may be used.  Comments are introduced with
+# "#" anywhere on a line.  The complete list of parameter names and allowed
+# values can be found in the PostgreSQL documentation.
+#
+# The commented-out settings shown in this file represent the default values.
+# Re-commenting a setting is NOT sufficient to revert it to the default value;
+# you need to reload the server.
+#
+# This file is read on server startup and when the server receives a SIGHUP
+# signal.  If you edit the file on a running system, you have to SIGHUP the
+# server for the changes to take effect, or use "pg_ctl reload".  Some
+# parameters, which are marked below, require a server shutdown and restart to
+# take effect.
+#
+# Any parameter can also be given as a command-line option to the server, e.g.,
+# "postgres -c log_connections=on".  Some parameters can be changed at run time
+# with the "SET" SQL command.
+#
+# Memory units:  kB = kilobytes        Time units:  ms  = milliseconds
+#                MB = megabytes                     s   = seconds
+#                GB = gigabytes                     min = minutes
+#                                                   h   = hours
+#                                                   d   = days
+
+#------------------------------------------------------------------------------
+# FILE LOCATIONS
+#------------------------------------------------------------------------------
+
+# The default values of these variables are driven from the -D command-line
+# option or PGDATA environment variable, represented here as ConfigDir.
+
+#data_directory = 'ConfigDir'           # use data in another directory
+                                        # (change requires restart)
+#hba_file = 'ConfigDir/pg_hba.conf'     # host-based authentication file
+                                        # (change requires restart)
+#ident_file = 'ConfigDir/pg_ident.conf' # ident configuration file
+                                        # (change requires restart)
+
+# If external_pid_file is not explicitly set, no extra PID file is written.
+#external_pid_file = '(none)'           # write an extra PID file
+                                        # (change requires restart)
+
+#------------------------------------------------------------------------------
+# CONNECTIONS AND AUTHENTICATION
+#------------------------------------------------------------------------------
+
+# - Connection Settings -
+
+#listen_addresses = 'localhost'         # what IP address(es) to listen on;
+                                        # comma-separated list of addresses;
+                                        # defaults to 'localhost', '*' = all
+                                        # (change requires restart)
+#port = 5432                            # (change requires restart)
+max_connections = 100                   # (change requires restart)
+# Note:  Increasing max_connections costs ~400 bytes of shared memory per
+# connection slot, plus lock space (see max_locks_per_transaction).
+#superuser_reserved_connections = 3     # (change requires restart)
+#unix_socket_directory = ''             # (change requires restart)
+#unix_socket_group = ''                 # (change requires restart)
+#unix_socket_permissions = 0777         # begin with 0 to use octal notation
+                                        # (change requires restart)
+#bonjour = off                          # advertise server via Bonjour
+                                        # (change requires restart)
+#bonjour_name = ''                      # defaults to the computer name
+                                        # (change requires restart)
+
+# - Security and Authentication -
+
+#authentication_timeout = 1min          # 1s-600s
+#ssl = off                              # (change requires restart)
+#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH'      # allowed SSL ciphers
+                                        # (change requires restart)
+#ssl_renegotiation_limit = 512MB        # amount of data between renegotiations
+#password_encryption = on
+#db_user_namespace = off
+
+# Kerberos and GSSAPI
+#krb_server_keyfile = ''
+#krb_srvname = 'postgres'               # (Kerberos only)
+#krb_caseins_users = off
+
+# - TCP Keepalives -
+# see "man 7 tcp" for details
+
+#tcp_keepalives_idle = 0                # TCP_KEEPIDLE, in seconds;
+                                        # 0 selects the system default
+#tcp_keepalives_interval = 0            # TCP_KEEPINTVL, in seconds;
+                                        # 0 selects the system default
+#tcp_keepalives_count = 0               # TCP_KEEPCNT;
+                                        # 0 selects the system default
+
+#------------------------------------------------------------------------------
+# RESOURCE USAGE (except WAL)
+#------------------------------------------------------------------------------
+
+# - Memory -
+
+shared_buffers = 256MB                  # min 128kB
+                                        # (change requires restart)
+#temp_buffers = 8MB                     # min 800kB
+#max_prepared_transactions = 0          # zero disables the feature
+                                        # (change requires restart)
+# Note:  Increasing max_prepared_transactions costs ~600 bytes of shared memory
+# per transaction slot, plus lock space (see max_locks_per_transaction).
+# It is not advisable to set max_prepared_transactions nonzero unless you
+# actively intend to use prepared transactions.
+work_mem = 128MB                        # min 64kB
+maintenance_work_mem = 128MB            # min 1MB
+max_stack_depth = 4MB                   # min 100kB
+
+# - Kernel Resource Usage -
+
+#max_files_per_process = 1000           # min 25
+                                        # (change requires restart)
+#shared_preload_libraries = ''          # (change requires restart)
+
+# - Cost-Based Vacuum Delay -
+
+#vacuum_cost_delay = 0ms                # 0-100 milliseconds
+#vacuum_cost_page_hit = 1               # 0-10000 credits
+#vacuum_cost_page_miss = 10             # 0-10000 credits
+#vacuum_cost_page_dirty = 20            # 0-10000 credits
+#vacuum_cost_limit = 200                # 1-10000 credits
+
+# - Background Writer -
+
+#bgwriter_delay = 200ms                 # 10-10000ms between rounds
+#bgwriter_lru_maxpages = 100            # 0-1000 max buffers written/round
+#bgwriter_lru_multiplier = 2.0          # 0-10.0 multipler on buffers scanned/round
+
+# - Asynchronous Behavior -
+
+effective_io_concurrency = 4            # 1-1000. 0 disables prefetching
+
+#------------------------------------------------------------------------------
+# WRITE AHEAD LOG
+#------------------------------------------------------------------------------
+
+# - Settings -
+
+#wal_level = minimal                    # minimal, archive, or hot_standby
+                                        # (change requires restart)
+#fsync = on                             # turns forced synchronization on or off
+synchronous_commit = off                # synchronization level; on, off, or local
+#wal_sync_method = fsync                # the default is the first option
+                                        # supported by the operating system:
+                                        #   open_datasync
+                                        #   fdatasync (default on Linux)
+                                        #   fsync
+                                        #   fsync_writethrough
+                                        #   open_sync
+#full_page_writes = on                  # recover from partial page writes
+#wal_buffers = -1                       # min 32kB, -1 sets based on shared_buffers
+                                        # (change requires restart)
+#wal_writer_delay = 200ms               # 1-10000 milliseconds
+
+commit_delay = 10000                    # range 0-100000, in microseconds
+#commit_siblings = 5                    # range 1-1000
+
+# - Checkpoints -
+
+checkpoint_segments = 16                # in logfile segments, min 1, 16MB each
+#checkpoint_timeout = 5min              # range 30s-1h
+#checkpoint_completion_target = 0.5     # checkpoint target duration, 0.0 - 1.0
+#checkpoint_warning = 30s               # 0 disables
+
+# - Archiving -
+
+#archive_mode = off             # allows archiving to be done
+                                # (change requires restart)
+#archive_command = ''           # command to use to archive a logfile segment
+#archive_timeout = 0            # force a logfile segment switch after this
+                                # number of seconds; 0 disables
+
+#------------------------------------------------------------------------------
+# REPLICATION
+#------------------------------------------------------------------------------
+
+# - Master Server -
+
+# These settings are ignored on a standby server
+
+#max_wal_senders = 0            # max number of walsender processes
+                                # (change requires restart)
+#wal_sender_delay = 1s          # walsender cycle time, 1-10000 milliseconds
+#wal_keep_segments = 0          # in logfile segments, 16MB each; 0 disables
+#vacuum_defer_cleanup_age = 0   # number of xacts by which cleanup is delayed
+#replication_timeout = 60s      # in milliseconds; 0 disables
+#synchronous_standby_names = '' # standby servers that provide sync rep
+                                # comma-separated list of application_name
+                                # from standby(s); '*' = all
+
+# - Standby Servers -
+
+# These settings are ignored on a master server
+
+#hot_standby = off                      # "on" allows queries during recovery
+                                        # (change requires restart)
+#max_standby_archive_delay = 30s        # max delay before canceling queries
+                                        # when reading WAL from archive;
+                                        # -1 allows indefinite delay
+#max_standby_streaming_delay = 30s      # max delay before canceling queries
+                                        # when reading streaming WAL;
+                                        # -1 allows indefinite delay
+#wal_receiver_status_interval = 10s     # send replies at least this often
+                                        # 0 disables
+#hot_standby_feedback = off             # send info from standby to prevent
+                                        # query conflicts
+
+#------------------------------------------------------------------------------
+# QUERY TUNING
+#------------------------------------------------------------------------------
+
+# - Planner Method Configuration -
+
+#enable_bitmapscan = on
+#enable_hashagg = on
+#enable_hashjoin = on
+#enable_indexscan = on
+#enable_material = on
+#enable_mergejoin = on
+#enable_nestloop = on
+#enable_seqscan = on
+#enable_sort = on
+#enable_tidscan = on
+
+# - Planner Cost Constants -
+
+#seq_page_cost = 1.0                    # measured on an arbitrary scale
+#random_page_cost = 4.0                 # same scale as above
+#cpu_tuple_cost = 0.01                  # same scale as above
+#cpu_index_tuple_cost = 0.005           # same scale as above
+#cpu_operator_cost = 0.0025             # same scale as above
+#effective_cache_size = 128MB
+
+# - Genetic Query Optimizer -
+
+#geqo = on
+#geqo_threshold = 12
+#geqo_effort = 5                        # range 1-10
+#geqo_pool_size = 0                     # selects default based on effort
+#geqo_generations = 0                   # selects default based on effort
+#geqo_selection_bias = 2.0              # range 1.5-2.0
+#geqo_seed = 0.0                        # range 0.0-1.0
+
+# - Other Planner Options -
+
+#default_statistics_target = 100        # range 1-10000
+#constraint_exclusion = partition       # on, off, or partition
+#cursor_tuple_fraction = 0.1            # range 0.0-1.0
+#from_collapse_limit = 8
+#join_collapse_limit = 8                # 1 disables collapsing of explicit
+                                        # JOIN clauses
+
+#------------------------------------------------------------------------------
+# ERROR REPORTING AND LOGGING
+#------------------------------------------------------------------------------
+
+# - Where to Log -
+
+#log_destination = 'stderr'             # Valid values are combinations of
+                                        # stderr, csvlog, syslog, and eventlog,
+                                        # depending on platform.  csvlog
+                                        # requires logging_collector to be on.
+
+# This is used when logging to stderr:
+logging_collector = on                  # Enable capturing of stderr and csvlog
+                                        # into log files. Required to be on for
+                                        # csvlogs.
+                                        # (change requires restart)
+
+# These are only used if logging_collector is on:
+#log_directory = 'pg_log'               # directory where log files are written,
+                                        # can be absolute or relative to PGDATA
+log_filename = 'postgresql-%a.log'      # log file name pattern,
+                                        # can include strftime() escapes
+#log_file_mode = 0600                   # creation mode for log files,
+                                        # begin with 0 to use octal notation
+log_truncate_on_rotation = on           # If on, an existing log file with the
+                                        # same name as the new log file will be
+                                        # truncated rather than appended to.
+                                        # But such truncation only occurs on
+                                        # time-driven rotation, not on restarts
+                                        # or size-driven rotation.  Default is
+                                        # off, meaning append to existing files
+                                        # in all cases.
+log_rotation_age = 1d                   # Automatic rotation of logfiles will
+                                        # happen after that time.  0 disables.
+log_rotation_size = 0                   # Automatic rotation of logfiles will
+                                        # happen after that much log output.
+                                        # 0 disables.
+
+# These are relevant when logging to syslog:
+#syslog_facility = 'LOCAL0'
+#syslog_ident = 'postgres'
+
+#silent_mode = off                      # Run server silently.
+                                        # DO NOT USE without syslog or
+                                        # logging_collector
+                                        # (change requires restart)
+
+# - When to Log -
+
+#client_min_messages = notice           # values in order of decreasing detail:
+                                        #   debug5
+                                        #   debug4
+                                        #   debug3
+                                        #   debug2
+                                        #   debug1
+                                        #   log
+                                        #   notice
+                                        #   warning
+                                        #   error
+
+#log_min_messages = warning             # values in order of decreasing detail:
+                                        #   debug5
+                                        #   debug4
+                                        #   debug3
+                                        #   debug2
+                                        #   debug1
+                                        #   info
+                                        #   notice
+                                        #   warning
+                                        #   error
+                                        #   log
+                                        #   fatal
+                                        #   panic
+
+#log_min_error_statement = error        # values in order of decreasing detail:
+                                        #   debug5
+                                        #   debug4
+                                        #   debug3
+                                        #   debug2
+                                        #   debug1
+                                        #   info
+                                        #   notice
+                                        #   warning
+                                        #   error
+                                        #   log
+                                        #   fatal
+                                        #   panic (effectively off)
+
+#log_min_duration_statement = -1        # -1 is disabled, 0 logs all statements
+                                        # and their durations, > 0 logs only
+                                        # statements running at least this number
+                                        # of milliseconds
+
+# - What to Log -
+
+#debug_print_parse = off
+#debug_print_rewritten = off
+#debug_print_plan = off
+#debug_pretty_print = on
+#log_checkpoints = off
+#log_connections = off
+#log_disconnections = off
+#log_duration = off
+#log_error_verbosity = default          # terse, default, or verbose messages
+#log_hostname = off
+log_line_prefix = '%t '                 # special values:
+                                        #   %a = application name
+                                        #   %u = user name
+                                        #   %d = database name
+                                        #   %r = remote host and port
+                                        #   %h = remote host
+                                        #   %p = process ID
+                                        #   %t = timestamp without milliseconds
+                                        #   %m = timestamp with milliseconds
+                                        #   %i = command tag
+                                        #   %e = SQL state
+                                        #   %c = session ID
+                                        #   %l = session line number
+                                        #   %s = session start timestamp
+                                        #   %v = virtual transaction ID
+                                        #   %x = transaction ID (0 if none)
+                                        #   %q = stop here in non-session
+                                        #        processes
+                                        #   %% = '%'
+                                        # e.g. '<%u%%%d> '
+#log_lock_waits = off                   # log lock waits >= deadlock_timeout
+#log_statement = 'none'                 # none, ddl, mod, all
+#log_temp_files = -1                    # log temporary files equal or larger
+                                        # than the specified size in kilobytes;
+                                        # -1 disables, 0 logs all temp files
+#log_timezone = '(defaults to server environment setting)'
+
+#------------------------------------------------------------------------------
+# RUNTIME STATISTICS
+#------------------------------------------------------------------------------
+
+# - Query/Index Statistics Collector -
+
+#track_activities = on
+#track_counts = on
+#track_functions = none                 # none, pl, all
+#track_activity_query_size = 1024       # (change requires restart)
+#update_process_title = on
+#stats_temp_directory = 'pg_stat_tmp'
+
+# - Statistics Monitoring -
+
+#log_parser_stats = off
+#log_planner_stats = off
+#log_executor_stats = off
+#log_statement_stats = off
+
+#------------------------------------------------------------------------------
+# AUTOVACUUM PARAMETERS
+#------------------------------------------------------------------------------
+
+#autovacuum = on                        # Enable autovacuum subprocess?  'on'
+                                        # requires track_counts to also be on.
+#log_autovacuum_min_duration = -1       # -1 disables, 0 logs all actions and
+                                        # their durations, > 0 logs only
+                                        # actions running at least this number
+                                        # of milliseconds.
+#autovacuum_max_workers = 3             # max number of autovacuum subprocesses
+                                        # (change requires restart)
+#autovacuum_naptime = 1min              # time between autovacuum runs
+#autovacuum_vacuum_threshold = 50       # min number of row updates before
+                                        # vacuum
+#autovacuum_analyze_threshold = 50      # min number of row updates before
+                                        # analyze
+#autovacuum_vacuum_scale_factor = 0.2   # fraction of table size before vacuum
+#autovacuum_analyze_scale_factor = 0.1  # fraction of table size before analyze
+#autovacuum_freeze_max_age = 200000000  # maximum XID age before forced vacuum
+                                        # (change requires restart)
+#autovacuum_vacuum_cost_delay = 20ms    # default vacuum cost delay for
+                                        # autovacuum, in milliseconds;
+                                        # -1 means use vacuum_cost_delay
+#autovacuum_vacuum_cost_limit = -1      # default vacuum cost limit for
+                                        # autovacuum, -1 means use
+                                        # vacuum_cost_limit
+
+#------------------------------------------------------------------------------
+# CLIENT CONNECTION DEFAULTS
+#------------------------------------------------------------------------------
+
+# - Statement Behavior -
+
+#search_path = '"$user",public'         # schema names
+#default_tablespace = ''                # a tablespace name, '' uses the default
+#temp_tablespaces = ''                  # a list of tablespace names, '' uses
+                                        # only default tablespace
+#check_function_bodies = on
+#default_transaction_isolation = 'read committed'
+#default_transaction_read_only = off
+#default_transaction_deferrable = off
+#session_replication_role = 'origin'
+#statement_timeout = 0                  # in milliseconds, 0 is disabled
+#vacuum_freeze_min_age = 50000000
+#vacuum_freeze_table_age = 150000000
+#bytea_output = 'hex'                   # hex, escape
+#xmlbinary = 'base64'
+#xmloption = 'content'
+
+# - Locale and Formatting -
+
+datestyle = 'iso, mdy'
+#intervalstyle = 'postgres'
+#timezone = '(defaults to server environment setting)'
+#timezone_abbreviations = 'Default'     # Select the set of available time zone
+                                        # abbreviations.  Currently, there are
+                                        #   Default
+                                        #   Australia
+                                        #   India
+                                        # You can create your own file in
+                                        # share/timezonesets/.
+#extra_float_digits = 0                 # min -15, max 3
+#client_encoding = sql_ascii            # actually, defaults to database
+                                        # encoding
+
+# These settings are initialized by initdb, but they can be changed.
+lc_messages = 'en_US.UTF-8'                     # locale for system error message
+                                        # strings
+lc_monetary = 'en_US.UTF-8'                     # locale for monetary formatting
+lc_numeric = 'en_US.UTF-8'                      # locale for number formatting
+lc_time = 'en_US.UTF-8'                         # locale for time formatting
+
+# default configuration for text search
+default_text_search_config = 'pg_catalog.english'
+
+# - Other Defaults -
+
+#dynamic_library_path = '$libdir'
+#local_preload_libraries = ''
+
+#------------------------------------------------------------------------------
+# LOCK MANAGEMENT
+#------------------------------------------------------------------------------
+
+#deadlock_timeout = 1s
+#max_locks_per_transaction = 64         # min 10
+                                        # (change requires restart)
+# Note:  Each lock table slot uses ~270 bytes of shared memory, and there are
+# max_locks_per_transaction * (max_connections + max_prepared_transactions)
+# lock table slots.
+#max_pred_locks_per_transaction = 64    # min 10
+                                        # (change requires restart)
+
+#------------------------------------------------------------------------------
+# VERSION/PLATFORM COMPATIBILITY
+#------------------------------------------------------------------------------
+
+# - Previous PostgreSQL Versions -
+
+#array_nulls = on
+#backslash_quote = safe_encoding        # on, off, or safe_encoding
+#default_with_oids = off
+#escape_string_warning = on
+#lo_compat_privileges = off
+#quote_all_identifiers = off
+#sql_inheritance = on
+#standard_conforming_strings = on
+#synchronize_seqscans = on
+
+# - Other Platforms and Clients -
+
+#transform_null_equals = off
+
+#------------------------------------------------------------------------------
+# ERROR HANDLING
+#------------------------------------------------------------------------------
+
+#exit_on_error = off                            # terminate session on any error?
+#restart_after_crash = on                       # reinitialize after backend crash?
+
+#------------------------------------------------------------------------------
+# CUSTOMIZED OPTIONS
+#------------------------------------------------------------------------------
+
+#custom_variable_classes = ''           # list of custom variable class names

data/postgresql/ubuntu/pg_ident.conf

@@ -0,0 +1,42 @@
+# PostgreSQL User Name Maps
+# =========================
+#
+# Refer to the PostgreSQL documentation, chapter "Client
+# Authentication" for a complete description.  A short synopsis
+# follows.
+#
+# This file controls PostgreSQL user name mapping.  It maps external
+# user names to their corresponding PostgreSQL user names.  Records
+# are of the form:
+#
+# MAPNAME  SYSTEM-USERNAME  PG-USERNAME
+#
+# (The uppercase quantities must be replaced by actual values.)
+#
+# MAPNAME is the (otherwise freely chosen) map name that was used in
+# pg_hba.conf.  SYSTEM-USERNAME is the detected user name of the
+# client.  PG-USERNAME is the requested PostgreSQL user name.  The
+# existence of a record specifies that SYSTEM-USERNAME may connect as
+# PG-USERNAME.
+#
+# If SYSTEM-USERNAME starts with a slash (/), it will be treated as a
+# regular expression.  Optionally this can contain a capture (a
+# parenthesized subexpression).  The substring matching the capture
+# will be substituted for \1 (backslash-one) if present in
+# PG-USERNAME.
+#
+# Multiple maps may be specified in this file and used by pg_hba.conf.
+#
+# No map names are defined in the default configuration.  If all
+# system user names and PostgreSQL user names are the same, you don't
+# need anything in this file.
+#
+# This file is read on server startup and when the postmaster receives
+# a SIGHUP signal.  If you edit the file on a running system, you have
+# to SIGHUP the postmaster for the changes to take effect.  You can
+# use "pg_ctl reload" to do that.
+
+# Put your actual configuration here
+# ----------------------------------
+
+# MAPNAME       SYSTEM-USERNAME         PG-USERNAME

data/{etc/postgresql/9.1/main → postgresql/ubuntu}/postgresql.conf

@@ -112,7 +112,7 @@ shared_buffers = 256MB                  # min 128kB
 # per transaction slot, plus lock space (see max_locks_per_transaction).
 # It is not advisable to set max_prepared_transactions nonzero unless you
 # actively intend to use prepared transactions.
-work_mem = 16MB                         # min 64kB
+work_mem = 128MB                        # min 64kB
 maintenance_work_mem = 128MB            # min 1MB
 max_stack_depth = 4MB                   # min 100kB
 
@@ -149,7 +149,7 @@ effective_io_concurrency = 4            # 1-1000. 0 disables prefetching
 #wal_level = minimal                    # minimal, archive, or hot_standby
                                         # (change requires restart)
 #fsync = on                             # turns forced synchronization on or off
-#synchronous_commit = on                # synchronization level; on, off, or local
+synchronous_commit = off                # synchronization level; on, off, or local
 #wal_sync_method = fsync                # the default is the first option
                                         # supported by the operating system:
                                         #   open_datasync
@@ -162,12 +162,12 @@ effective_io_concurrency = 4            # 1-1000. 0 disables prefetching
                                         # (change requires restart)
 #wal_writer_delay = 200ms               # 1-10000 milliseconds
 
-#commit_delay = 0                       # range 0-100000, in microseconds
+commit_delay = 10000                    # range 0-100000, in microseconds
 #commit_siblings = 5                    # range 1-1000
 
 # - Checkpoints -
 
-#checkpoint_segments = 3                # in logfile segments, min 1, 16MB each
+checkpoint_segments = 16                # in logfile segments, min 1, 16MB each
 #checkpoint_timeout = 5min              # range 30s-1h
 #checkpoint_completion_target = 0.5     # checkpoint target duration, 0.0 - 1.0
 #checkpoint_warning = 30s               # 0 disables

data/test/test_syncwrap.rb

@@ -42,13 +42,9 @@ class TestSyncWrap < MiniTest::Unit::TestCase
     include SyncWrap::JRuby
     include SyncWrap::Iyyov
     include SyncWrap::Geminabox
-
-    include SyncWrap::RHEL
-    include SyncWrap::Ubuntu # Not a recomendated combo
-
+    include SyncWrap::Ubuntu
     include SyncWrap::EC2
-    include SyncWrap::PostgreSQL::Ubuntu
-    include SyncWrap::PostgreSQL::EC2
+    include SyncWrap::PostgreSQL
   end
 
   def test_init

metadata

@@ -2,14 +2,14 @@
 name: syncwrap
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -56,13 +56,9 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- etc/gemrc
 - etc/init.d/iyyov
-- etc/postgresql/9.1/main/environment
-- etc/postgresql/9.1/main/pg_ctl.conf
-- etc/postgresql/9.1/main/pg_hba.conf
-- etc/postgresql/9.1/main/pg_ident.conf
-- etc/postgresql/9.1/main/postgresql.conf
-- etc/postgresql/9.1/main/start.conf
+- etc/sysconfig/pgsql/postgresql
 - etc/sysctl.d/61-postgresql-shm.conf
 - lib/syncwrap/base.rb
 - lib/syncwrap.rb
@@ -79,6 +75,15 @@ files:
 - lib/syncwrap/rhel.rb
 - lib/syncwrap/ubuntu.rb
 - lib/syncwrap/user_run.rb
+- postgresql/rhel/pg_hba.conf
+- postgresql/rhel/pg_ident.conf
+- postgresql/rhel/postgresql.conf
+- postgresql/ubuntu/environment
+- postgresql/ubuntu/pg_ctl.conf
+- postgresql/ubuntu/pg_hba.conf
+- postgresql/ubuntu/pg_ident.conf
+- postgresql/ubuntu/postgresql.conf
+- postgresql/ubuntu/start.conf
 - test/test_syncwrap.rb
 - usr/local/bin/jgem
 - var/iyyov/jobs.rb