syncwrap 2.1.3 → 2.2.0

data/lib/syncwrap/distro.rb

@@ -25,13 +25,8 @@ module SyncWrap
     # (default: /usr/local)
     attr_accessor :local_root
 
-    # A Hash of internal/common package names to distro specific package
-    # names.
-    attr_reader :packages_map
-
     def initialize( *args )
       @local_root = '/usr/local'
-      @packages_map = {}
 
       super( *args )
     end
@@ -41,15 +36,8 @@ module SyncWrap
       self
     end
 
-    # Map internal/common names and return distro-specific names. If a
-    # mapping does not exist, return the original name.
-    def dist_map_packages( *pkgs )
-      pkgs.flatten.compact.map { |pkg| packages_map[ pkg ] || pkg }
-    end
-
-    # Install the specified packages using distro-specific mapped
-    # package names. A trailing hash is interpreted as options, see
-    # below.
+    # Install the specified package names. A trailing hash is
+    # interpreted as options, see below.
     #
     # ==== Options
     #
@@ -61,8 +49,7 @@ module SyncWrap
       raise "Include a distro-specific component, e.g. Ubuntu, RHEL"
     end
 
-    # Uninstall specified packages using distro-specific mapped
-    # package names and command.
+    # Uninstall the specified package names.
     def dist_uninstall( *pkgs )
       raise "Include a distro-specific component, e.g. Ubuntu, RHEL"
     end

data/lib/syncwrap/git_help.rb

@@ -35,13 +35,13 @@ module SyncWrap
 
     # Return the abbreviated SHA-1 hash for the last git commit at
     # path
-    def self.hash( path = nil )
+    def self.git_hash( path = nil )
       path ||= caller_path( caller )
       `cd #{path} && git log -n 1 --format='format:%h'`
     end
 
     # Return a lambda that will #require_clean! for callers path
-    # before providing #hash. Use this for cases where you only want
+    # before providing #git_hash. Use this for cases where you only want
     # to use a git hash when it is an accurate reflection of the local
     # file state. Since the test is deferred, it will only be required
     # for actions (i.e. image creation, etc.) that actually use it.
@@ -49,7 +49,7 @@ module SyncWrap
       cpath = caller_path( caller )
       lambda do
         require_clean!( cpath )
-        hash( cpath )
+        git_hash( cpath )
       end
     end
 

data/lib/syncwrap/shell.rb

@@ -24,19 +24,20 @@ module SyncWrap
 
   # Low level command construction and process output capture.
   #
-  # == Supported Commands
+  # == Supported Command Forms
   #
-  # Local:
-  #   bash [-v|-x -e -n] -c COMMANDS
-  #   sudo :sudo_flags [-u user] bash [-v|-x -e -n] -c COMMANDS
+  #   LOCAL:
+  #   bash BASH_FLAGS -c COMMANDS
+  #   sudo SUDO_FLAGS bash BASH_FLAGS -c COMMANDS
   #
-  # Remote:
-  #   ssh :ssh_flags :host bash [-v|-x -e -n] -c "COMMANDS"
-  #   ssh :ssh_flags :host sudo :sudo_flags [-u user] bash [-v|-x -e -n] -c "COMMANDS"
+  #   REMOTE:
+  #   ssh SSH_FLAGS HOST bash BASH_FLAGS -c "COMMANDS" [1>&2]
+  #   ssh SSH_FLAGS HOST sudo SUDO_FLAGS bash BASH_FLAGS -c "COMMANDS" [1>&2]
   #
-  # Example ssh_flags: -i ./key.pem -l ec2-user
+  #   BASH_FLAGS: [-v|-x] [-e] [-o pipefail] [-n]
+  #   SUDO_FLAGS: [-u :user] :sudo_flags ...
+  #   SSH_FLAGS:  [-l :ssh_user] [-i :ssh_user_pem] :ssh_flags ...
   #
-  # Example sudo_flags: -H
   module Shell
 
     private
@@ -87,7 +88,12 @@ module SyncWrap
     # passed to #commmand_lines_cleanup.
     def sh_args( command, opts = {} ) # :doc:
       args = [ 'bash' ]
-      args << '-e' if opts[ :error ].nil? || opts[ :error ] == :exit
+      if opts[ :error ].nil? || opts[ :error ]
+        args << '-e'
+        args += %w[ -o pipefail ] unless opts[ :pipefail ] == false
+      else
+        args += %w[ -o pipefail ] if opts[ :pipefail ]
+      end
       args << '-n' if opts[ :dryrun ]
 
       if opts[ :coalesce ]

data/sync/etc/sysctl.d/{61-postgresql-shm.conf → 61-postgresql-shm.conf.erb}

@@ -1,4 +1,4 @@
 # Shared memory settings for PostgreSQL (SyncWrap installer)
 
 # Maximum size of shared memory segment in bytes
-kernel.shmmax = 300000000
+kernel.shmmax = <%= shared_memory_max %>

data/sync/postgresql/{ubuntu/pg_hba.conf → pg_hba.conf.erb}

@@ -84,11 +84,23 @@ local   all             postgres                                peer
 # TYPE  DATABASE        USER            ADDRESS                 METHOD
 
 # "local" is for Unix domain socket connections only
-local   all             all                                     peer
+local   all             all                                     <%= local_access %>
+<% if local_network_access %>
 # IPv4 local connections:
-host    all             all             127.0.0.1/32            trust
+host    all             all             127.0.0.1/32            <%= local_network_access %>
 # IPv6 local connections:
-host    all             all             ::1/128                 trust
+host    all             all             ::1/128                 <%= local_network_access %>
+<% end %>
+<% if network_access %>
+<%  if network_v4_mask %>
+# IPv4 network connections:
+host    all             all             <%=network_v4_mask%>        <%= network_access %>
+<%  end %>
+<%  if network_v6_mask %>
+# IPv6 network connections:
+host    all             all             <%=network_v6_mask%>        <%= network_access %>
+<%  end %>
+<% end %>
 # Allow replication connections from localhost, by a user with the
 # replication privilege.
 #local   replication     postgres                                peer

data/sync/postgresql/{rhel/postgresql.conf → postgresql.conf.erb}

@@ -37,6 +37,22 @@
 # The default values of these variables are driven from the -D command-line
 # option or PGDATA environment variable, represented here as ConfigDir.
 
+<% if pg_specify_etc_config %>
+data_directory = '/var/lib/postgresql/<%= version %>/main'
+                                        # use data in another directory
+                                        # (change requires restart)
+hba_file = '/etc/postgresql/<%= version %>/main/pg_hba.conf'
+                                        # host-based authentication file
+                                        # (change requires restart)
+ident_file = '/etc/postgresql/<%= version %>/main/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 = '/var/run/postgresql/<%= version %>-main.pid'
+                                        # write an extra PID file
+                                        # (change requires restart)
+<% else %>
 #data_directory = 'ConfigDir'           # use data in another directory
                                         # (change requires restart)
 #hba_file = 'ConfigDir/pg_hba.conf'     # host-based authentication file
@@ -47,6 +63,7 @@
 # If external_pid_file is not explicitly set, no extra PID file is written.
 #external_pid_file = ''                 # write an extra PID file
                                         # (change requires restart)
+<% end %>
 
 #------------------------------------------------------------------------------
 # CONNECTIONS AND AUTHENTICATION
@@ -54,18 +71,23 @@
 
 # - Connection Settings -
 
+<% if network_access %>
+listen_addresses = '*'
+<% end %>
 #listen_addresses = 'localhost'         # what IP address(es) to listen on;
                                         # comma-separated list of addresses;
                                         # defaults to 'localhost'; use '*' for all
                                         # (change requires restart)
 #port = 5432                            # (change requires restart)
-# Note: In RHEL/Fedora installations, you can't set the port number here;
+# Note: In RHEL-like installations, you can't set the port number here;
 # adjust it in the service file instead.
 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_directories = '/var/run/postgresql, /tmp'  # comma-separated list of directories
+#unix_socket_directory = '/var/run/postgresql' # < 9.3
+#unix_socket_directories = '/var/run/postgresql, /tmp'
+                                        # comma-separated list of directories (9.3)
                                         # (change requires restart)
 #unix_socket_group = ''                 # (change requires restart)
 #unix_socket_permissions = 0777         # begin with 0 to use octal notation
@@ -79,7 +101,7 @@ max_connections = 100                   # (change requires restart)
 
 #authentication_timeout = 1min          # 1s-600s
 #ssl = off                              # (change requires restart)
-#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH'      # allowed SSL ciphers
+#ssl_ciphers = 'DEFAULT:!LOW:!EXP:!MD5:@STRENGTH'       # allowed SSL ciphers
                                         # (change requires restart)
 #ssl_renegotiation_limit = 512MB        # amount of data between renegotiations
 #ssl_cert_file = 'server.crt'           # (change requires restart)
@@ -110,7 +132,7 @@ max_connections = 100                   # (change requires restart)
 
 # - Memory -
 
-shared_buffers = 256MB                  # min 128kB
+shared_buffers = <%= shared_buffers %>  # min 128kB
                                         # (change requires restart)
 #temp_buffers = 8MB                     # min 800kB
 #max_prepared_transactions = 0          # zero disables the feature
@@ -119,9 +141,14 @@ 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 = 128MB                        # min 64kB
-maintenance_work_mem = 128MB            # min 1MB
-max_stack_depth = 4MB                   # min 100kB
+work_mem = <%= work_mem %>              # min 64kB
+maintenance_work_mem = <%= maintenance_work_mem %> # min 1MB
+max_stack_depth = <%= max_stack_depth %> # min 100kB
+
+# - Disk -
+
+#temp_file_limit = -1                   # limits per-session temp file space
+                                        # in kB, or -1 for no limit
 
 # - Kernel Resource Usage -
 
@@ -131,7 +158,7 @@ max_stack_depth = 4MB                   # min 100kB
 
 # - Cost-Based Vacuum Delay -
 
-#vacuum_cost_delay = 0ms                # 0-100 milliseconds
+#vacuum_cost_delay = 0                  # 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
@@ -145,7 +172,8 @@ max_stack_depth = 4MB                   # min 100kB
 
 # - Asynchronous Behavior -
 
-effective_io_concurrency = 4            # 1-1000. 0 disables prefetching
+effective_io_concurrency = <%= effective_io_concurrency %>
+                                        # 1-1000. 0 disables prefetching
 
 #------------------------------------------------------------------------------
 # WRITE AHEAD LOG
@@ -156,7 +184,8 @@ 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 = off                # synchronization level; on, off, or local
+synchronous_commit = <%= synchronous_commit %>  # synchronization level;
+                                        # off, local, remote_write, or on
 #wal_sync_method = fsync                # the default is the first option
                                         # supported by the operating system:
                                         #   open_datasync
@@ -169,12 +198,12 @@ synchronous_commit = off                # synchronization level; on, off, or loc
                                         # (change requires restart)
 #wal_writer_delay = 200ms               # 1-10000 milliseconds
 
-commit_delay = 10000                    # range 0-100000, in microseconds
+commit_delay = <%= commit_delay %>      # range 0-100000, in microseconds
 #commit_siblings = 5                    # range 1-1000
 
 # - Checkpoints -
 
-checkpoint_segments = 16                # in logfile segments, min 1, 16MB each
+checkpoint_segments = <%= checkpoint_segments %> # in logfile segments (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
@@ -194,14 +223,15 @@ checkpoint_segments = 16                # in logfile segments, min 1, 16MB each
 # REPLICATION
 #------------------------------------------------------------------------------
 
-# - Master Server -
+# - Sending Server(s) -
 
 # Set these on the master and on any standby that will send replication data.
 
 #max_wal_senders = 0            # max number of walsender processes
                                 # (change requires restart)
 #wal_keep_segments = 0          # in logfile segments, 16MB each; 0 disables
-#replication_timeout = 60s      # in milliseconds; 0 disables
+#replication_timeout = 60s      # < 9.3
+#wal_sender_timeout = 60s       # in milliseconds; 0 disables (9.3)
 
 # - Master Server -
 
@@ -228,6 +258,9 @@ checkpoint_segments = 16                # in logfile segments, min 1, 16MB each
                                         # 0 disables
 #hot_standby_feedback = off             # send info from standby to prevent
                                         # query conflicts
+#wal_receiver_timeout = 60s             # time that receiver waits for
+                                        # communication from master
+                                        # in milliseconds; 0 disables
 
 #------------------------------------------------------------------------------
 # QUERY TUNING
@@ -281,7 +314,7 @@ checkpoint_segments = 16                # in logfile segments, min 1, 16MB each
 
 # - Where to Log -
 
-#log_destination = 'stderr'             # Valid values are combinations of
+log_destination = 'stderr'              # Valid values are combinations of
                                         # stderr, csvlog, syslog, and eventlog,
                                         # depending on platform.  csvlog
                                         # requires logging_collector to be on.
@@ -293,7 +326,7 @@ logging_collector = on                  # Enable capturing of stderr and csvlog
                                         # (change requires restart)
 
 # These are only used if logging_collector is on:
-#log_directory = 'pg_log'               # directory where log files are written,
+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
@@ -378,7 +411,7 @@ log_rotation_size = 0                   # Automatic rotation of logfiles will
 #log_duration = off
 #log_error_verbosity = default          # terse, default, or verbose messages
 #log_hostname = off
-log_line_prefix = '%t '                 # special values:
+log_line_prefix = '< %m >'              # special values:
                                         #   %a = application name
                                         #   %u = user name
                                         #   %d = database name
@@ -447,6 +480,9 @@ log_timezone = 'UTC'
 #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_multixact_freeze_max_age = 400000000        # maximum Multixact 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
@@ -470,8 +506,11 @@ log_timezone = 'UTC'
 #default_transaction_deferrable = off
 #session_replication_role = 'origin'
 #statement_timeout = 0                  # in milliseconds, 0 is disabled
+#lock_timeout = 0                       # in milliseconds, 0 is disabled
 #vacuum_freeze_min_age = 50000000
 #vacuum_freeze_table_age = 150000000
+#vacuum_multixact_freeze_min_age = 5000000
+#vacuum_multixact_freeze_table_age = 150000000
 #bytea_output = 'hex'                   # hex, escape
 #xmlbinary = 'base64'
 #xmloption = 'content'
@@ -547,6 +586,18 @@ default_text_search_config = 'pg_catalog.english'
 #exit_on_error = off                    # terminate session on any error?
 #restart_after_crash = on               # reinitialize after backend crash?
 
+#------------------------------------------------------------------------------
+# CONFIG FILE INCLUDES
+#------------------------------------------------------------------------------
+
+# These options allow settings to be loaded from files other than the
+# default postgresql.conf.
+
+#include_dir = 'conf.d'                 # include files ending in '.conf' from
+                                        # directory 'conf.d'
+#include_if_exists = 'exists.conf'      # include file only if it exists
+#include = 'special.conf'               # include file
+
 #------------------------------------------------------------------------------
 # CUSTOMIZED OPTIONS
 #------------------------------------------------------------------------------

data/test/test_shell.rb

@@ -132,6 +132,52 @@ class TestShell < MiniTest::Unit::TestCase
                   outputs, outputs )
   end
 
+  def test_shell_error_late_exit
+    exit_code, outputs = capture3( sh_args( <<-'SH', error: false ) )
+      echo before
+      (exit 33)
+      echo after
+      exit 34
+    SH
+    assert_equal( 34, exit_code )
+    assert_equal( [[:out, ( "before\nafter\n" )]],
+                  outputs, outputs )
+  end
+
+  def test_shell_error_early_exit
+    exit_code, outputs = capture3( sh_args( <<-'SH', error: true ) )
+      echo before
+      (exit 33)
+      echo after
+      exit 34
+    SH
+    assert_equal( 33, exit_code )
+    assert_equal( [[:out, ( "before\n" )]],
+                  outputs, outputs )
+  end
+
+  def test_shell_pipe_no_fail
+    exit_code, outputs =
+      capture3( sh_args( <<-'SH', error: true, pipefail: false ) )
+      (echo first && exit 33) | (cat - && echo second)
+      exit 34
+    SH
+    assert_equal( 34, exit_code )
+    assert_equal( [[:out, ( "first\nsecond\n" )]],
+                  outputs, outputs )
+  end
+
+  def test_shell_pipefail
+    exit_code, outputs =
+      capture3( sh_args( <<-'SH', error: true, pipefail: true ) )
+      (echo first && exit 33) | (cat - && echo second)
+      exit 34
+    SH
+    assert_equal( 33, exit_code )
+    assert_equal( [[:out, ( "first\nsecond\n" )]],
+                  outputs, outputs )
+  end
+
   def test_sudo
     skip unless SAFE_SUDO
     cmd = sudo_args( 'echo foo', user: :root )
@@ -140,6 +186,18 @@ class TestShell < MiniTest::Unit::TestCase
     assert_equal( [[:out, "foo\n"]], outputs, outputs )
   end
 
+  def test_sudo_pipefail
+    skip unless SAFE_SUDO
+    exit_code, outputs =
+      capture3( sudo_args( <<-'SH', user: :root, error: true, pipefail: true ) )
+      (echo first && exit 33) | (cat - && echo second)
+      exit 34
+    SH
+    assert_equal( 33, exit_code )
+    assert_equal( [[:out, ( "first\nsecond\n" )]],
+                  outputs, outputs )
+  end
+
   def test_ssh
     skip unless SAFE_SSH
     cmd = ssh_args( SAFE_SSH, 'echo foo', sh_verbose: :v )

data/test/test_space_main.rb

@@ -34,7 +34,7 @@ class TestSpaceMain < MiniTest::Unit::TestCase
   end
 
   def test
-    skip if defined?( JRUBY_VERSION ) # 1.6.8 and 1.7.10 both fail this test
+    skip if defined?( JRUBY_VERSION ) # 1.6.8, 1.7.10-12 fail this test
     assert( @sp.execute( @sp.hosts, [ [IyyovDaemon, :daemon_service_dir] ] ) )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: '1.46'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: '1.46'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +92,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -219,17 +205,14 @@ files:
 - sync/etc/init.d/iyyov.erb
 - sync/etc/init.d/qpidd
 - sync/etc/sysconfig/pgsql/postgresql.erb
-- sync/etc/sysctl.d/61-postgresql-shm.conf
+- sync/etc/sysctl.d/61-postgresql-shm.conf.erb
 - sync/jruby/bin/jgem
-- sync/postgresql/rhel/pg_hba.conf
-- sync/postgresql/rhel/pg_ident.conf
-- sync/postgresql/rhel/postgresql.conf
-- sync/postgresql/ubuntu/environment
-- sync/postgresql/ubuntu/pg_ctl.conf
-- sync/postgresql/ubuntu/pg_hba.conf
-- sync/postgresql/ubuntu/pg_ident.conf
-- sync/postgresql/ubuntu/postgresql.conf
-- sync/postgresql/ubuntu/start.conf
+- sync/postgresql/environment
+- sync/postgresql/pg_ctl.conf
+- sync/postgresql/pg_hba.conf.erb
+- sync/postgresql/pg_ident.conf
+- sync/postgresql/postgresql.conf.erb
+- sync/postgresql/start.conf
 - sync/src/hashdot/Makefile.erb
 - sync/src/hashdot/profiles/default.hdp.erb
 - sync/src/hashdot/profiles/jruby-common.hdp

data/sync/postgresql/rhel/pg_hba.conf

@@ -1,87 +0,0 @@
-# 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/sync/postgresql/ubuntu/pg_ident.conf

@@ -1,42 +0,0 @@
-# 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