syncwrap 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5896d57fe2fbc03aa1b81254619ed604b37ae513
-  data.tar.gz: 8764f0567918f0872297bda1802f179ece696b56
+  metadata.gz: 13c35dd94712da0efcf94baf546fe093c22ea98b
+  data.tar.gz: 7ab95e5de09411aeebb0999611e04eda2380fe49
 SHA512:
-  metadata.gz: a60f4f82c141f4aa2fe773b9a3e484123c8d02333130bf1a59c56df2dd6fe203adf03ff01926f3cdb4f9e4968ebe871ebb671ca914805117ae85a2ad888c33b4
-  data.tar.gz: c3fbff10f3100aa06ab58e0dc286bd29957256e9220f14d036432aaded32f85e681d2a7e078ad07037c30304b8483cf86672b3175536db40b2b6e35293ca8a86
+  metadata.gz: 00008c83b2ef58df4ca10b2913257963d9f64cc3ca992f6838d8a9bd075f8863a52265115016e1c93585bff946da6ac324a9bc6bf673ff3af308be95a3a3866a
+  data.tar.gz: b3c96fe0054c7011e05fb8bc858eaaab57dd08ea32ff0d9633fceddbce195bca6079d069fff7e9accfc3adb42a71ab37becf19f9bb25097cff80b1b4646fa7d0

data/History.rdoc

@@ -1,3 +1,64 @@
+=== 2.8.0 (2016-7-19)
+* Only allow public component methods to be executed via the
+  SyncWrap::Space#execute and thus the CLI. Previously it was possible
+  to execute protected or private methods.
+* Uniformly name start, stop, and restart methods on SyncWrap::Iyyov
+  and SyncWrap::PostgreSQL for consistency and use in the CLI.  Also
+  add reload and status methods to these components.
+* Add optional SyncWrap::Puma systemd_socket (activation) support:
+  * The systemd_unit property is deprecated in favor of systemd_service
+  * Add lookup for systemd unit source files under the specific names
+    configured, before using generic puma.service/puma.socket
+    templates.
+  * Add systemctl daemon-reload based on changes
+  * Restart service or both socket and service based on changes
+* Don't set a default port for SyncWrap::Puma, since users may prefer
+  to set port(s) in a puma config file. If relying on this port
+  selection, users will need to specify `port: 5874` on upgrade.
+* Add SyncWrap::Puma start, stop, restart, and status methods.
+* Add SyncWrap::SystemDService module for reuse
+* Make systemd flag consistent between RHEL and Debian and respect
+  false.
+* SyncWrap::Bundle, SyncWrap::BundledIyyovDaemon and SyncWrap::Puma
+  now support 'listening' for changes on multiple change keys, which
+  is more intuitive to configure than having SyncWrap::SourceTree
+  produce changes on multiple change keys.  However, the later is
+  still supported.
+* Add SyncWrap::ChangeKeyListener module for reuse
+* Add :mode option to SyncWrap::RunUser#mkdir_run_user,
+  SyncWrap::RunUser#run_dir_mode, SyncWrap::SourceTree#remote_dir_mode
+  and change defaults to 0755. This was previously hard-coded to 0775,
+  which caused ssh access as the :run_user to fail and other conflicts
+  with distro security features.
+* Set ssh option PasswordAuthentication=no when using
+  Users#ssh_user_pem. This is reasonable with use of a PEM file and
+  provides a (partial) workaround for an occasionally observed timing
+  issue causing a password prompt to be temporarily offered on a
+  booting CentOS host with Cloud-Init.
+* CLI (-l --list*) listings now attempt to format output to (Unix)
+  terminal width
+* The :check_install option to Distro#dist_install added in 2.7.0 is
+  now true (on) by default
+* The previously deprecated :succeed flag to
+  Disto#dist_install/dist_uninstall has been dropped
+* Replace RHEL installed test with "rpm -q" which is considerably
+  faster than "yum list"
+* Add RHEL#dist_install :yum_flags options for special cases
+* Fully replace the original use case for the :succeed option with
+  SyncWrap::RHEL#dist_install_url, defaulting to package name
+  extracted from rpm URL or file path for the install check
+* SyncWrap::Iyyov with systemd should also conditionally daemon-reload
+* Update SyncWrap::PostgreSQL and postgresql.conf for support of
+  version 9.6 (as of beta 2). Changes remain backward compatible with
+  9.1+ and SyncWrap 2.3+
+* Minor fixes based on ruby 2.4 testing (including with frozen string
+  literals)
+* Upgrade dev dependencies to minitest 5.8.4 and tarpit 2.1.1
+* Upgrade SyncWrap::CRubyVM default version to 2.1.10 (+ hash for 2.2.5)
+* Upgrade SyncWrap::JRubyVM default version to 1.7.24 (+ hash for 1.7.25)
+* Upgrade SyncWrap::BundlerGem default version to 1.12.5
+* Upgrade SyncWrap::TarpitGem default version to 2.1.1
+
 === 2.7.1 (2016-3-2)
 * Fix handling of the -R/--components-in-role flag to correctly limit
   to hosts including the role, for both execution and listing

data/Manifest.txt

@@ -18,6 +18,7 @@ lib/syncwrap/base.rb
 lib/syncwrap.rb
 lib/syncwrap/amazon_ec2.rb
 lib/syncwrap/amazon_ws.rb
+lib/syncwrap/change_key_listener.rb
 lib/syncwrap/cli.rb
 lib/syncwrap/component.rb
 lib/syncwrap/context.rb
@@ -32,6 +33,7 @@ lib/syncwrap/rsync.rb
 lib/syncwrap/ruby_support.rb
 lib/syncwrap/shell.rb
 lib/syncwrap/systemd.rb
+lib/syncwrap/systemd_service.rb
 lib/syncwrap/user_data.rb
 lib/syncwrap/version_support.rb
 lib/syncwrap/zone_balancer.rb
@@ -74,6 +76,7 @@ sync/etc/sysconfig/pgsql/postgresql.erb
 sync/etc/sysctl.d/61-postgresql-shm.conf.erb
 sync/etc/systemd/system/iyyov.service.erb
 sync/etc/systemd/system/puma.service.erb
+sync/etc/systemd/system/puma.socket.erb
 sync/jruby/bin/jgem
 sync/postgresql/environment
 sync/postgresql/pg_ctl.conf

data/lib/syncwrap/base.rb

@@ -15,7 +15,7 @@
 #++
 
 module SyncWrap
-  VERSION='2.7.1'
+  VERSION='2.8.0'
 
   GEM_ROOT = File.dirname(File.dirname(File.dirname(__FILE__))) # :nodoc:
 end

data/lib/syncwrap/change_key_listener.rb

@@ -0,0 +1,56 @@
+#--
+# Copyright (c) 2011-2016 David Kellum
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you
+# may not use this file except in compliance with the License.  You may
+# obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#++
+
+module SyncWrap
+
+  # Support module for components which listen for and act on changes
+  # set on SyncWrap::Context#state keys.
+  module ChangeKeyListener
+
+    protected
+
+    def initialize( opts = {} )
+      @change_key = nil
+      super
+    end
+
+    # An optional state key, or array of state keys, to check for
+    # changes.  (Default: nil; Example: :source_tree)
+    attr_accessor :change_key
+
+    # Returns true if there are any changes with any #change_key.
+    def change_key_changes?
+      Array( change_key ).any? do |k|
+        c = state[ k ]
+        c && !c.emtpy?
+      end
+    end
+
+    # Returns the combined array of all changes on all #change_key.
+    def change_key_changes
+      Array( change_key ).inject( [] ) do |m,k|
+        c = state[ k ]
+        if c
+          m + c
+        else
+          m
+        end
+      end
+    end
+
+  end
+
+end

data/lib/syncwrap/cli.rb

@@ -308,7 +308,7 @@ TEXT
       table = roles.map do |role|
         row = [ ':' + role.to_s ]
         classes = space.role( role ).map( &:class )
-        row << short_class_names( classes ).join(' ')
+        row << short_class_names( classes )
       end
       print_table( table )
       puts if multi
@@ -333,19 +333,56 @@ TEXT
     def print_table( table )
       max_columns = table.map( &:count ).max || 0
       col_widths = max_columns.times.map do |i|
-        table.map { |row| row[i] && row[i].length }.compact.max
+        table.map do |row|
+          case row[i]
+          when String
+            row[i].length
+          when Array
+            1
+          end
+        end.compact.max
       end
-      format = col_widths.inject("") do |f,w|
-        if f.empty? #first
-          f << "%-#{w}s     "
-        else
-          f << "%-#{w}s "
+      wfirst = unless col_widths.empty?
+                 col_widths[0] += 4 # Extra pad first col
+                 col_widths[0] + 1
+               end
+
+      table = table.map do |row|
+        row.map do |cell|
+          if cell.is_a?( Array )
+            l = 0
+            cell.inject( String.new ) do |m,i|
+              if l == 0 || ( wfirst + l + i.length + 1 < term_width )
+                m << i << ' '
+                l += i.length + 1
+              else
+                m << "\n" + (' ' * wfirst)
+                m << i << ' '
+                l = wfirst + i.length + 1
+              end
+              m
+            end
+          else
+            cell
+          end
         end
       end
 
+      wall = 0
+      format = col_widths.inject( String.new ) do |f,w|
+        if f.empty? || ( wall + w + 1 < term_width )
+          f << "%-#{w}s "
+          wall += w + 1
+        else
+          f[-1,1] = "\n"
+          f << ( ' ' * wfirst ) + "%-#{w}s "
+          wall = wfirst + w + 1
+        end
+        f
+      end
       table.each do |row|
         row[ max_columns ] = nil
-        puts format % row
+        puts (format % row ).gsub( /\s+$/, '' )
       end
     end
 
@@ -413,5 +450,31 @@ TEXT
       end
     end
 
+    def term_width
+      @term_width ||= ( unix? && (check_stty_width || check_tput_width) ) || 80
+    end
+
+    def unix?
+       !!( RbConfig::CONFIG['host_os'] =~
+           /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i )
+    end
+
+    def check_stty_width
+      s = `stty size 2>/dev/null`
+      s &&= s.split[1]
+      s &&= s.to_i
+      s if s && s >= 30
+    rescue
+      nil
+    end
+
+    def check_tput_width
+      s = `tput cols 2>/dev/null`
+      s &&= s.to_i
+      s if s && s >= 30
+    rescue
+      nil
+    end
+
   end
 end

data/lib/syncwrap/components/arch.rb

@@ -35,26 +35,24 @@ module SyncWrap
     # ==== Options
     #
     # :check_install:: Short-circuit if all packages already
-    #                  installed. Thus no upgrades will be performed.
+    #                  installed. Thus no upgrades will be
+    #                  performed. (Default: true)
     #
-    # Additional options are passed to the sudo calls.
+    # Options are also passed to the sudo calls.
     def dist_install( *pkgs )
-      opts = pkgs.last.is_a?( Hash ) && pkgs.pop.dup || {}
-      opts.delete( :minimal )
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
       pkgs.flatten!
-      chk = opts.delete( :check_install )
-      chk = opts.delete( :succeed ) if chk.nil?
+      chk = opts[ :check_install ]
       chk = check_install? if chk.nil?
-      dist_if_not_installed?( pkgs, chk, opts ) do
+      dist_if_not_installed?( pkgs, chk != false, opts ) do
         sudo( "pacman -S --noconfirm #{pkgs.join ' '}", opts )
       end
     end
 
     # Uninstall the specified package names. A trailing hash is
-    # interpreted as options, passed to the sudo calls.
+    # interpreted as options and passed to the sudo calls.
     def dist_uninstall( *pkgs )
-      opts = pkgs.last.is_a?( Hash ) && pkgs.pop.dup || {}
-      opts.delete( :succeed )
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
       pkgs.flatten!
       pkgs.each do |pkg|
         dist_if_installed?( pkg, opts ) do

data/lib/syncwrap/components/bundle.rb

@@ -18,6 +18,7 @@ require 'syncwrap/component'
 
 require 'syncwrap/git_help'
 require 'syncwrap/path_util'
+require 'syncwrap/change_key_listener'
 
 module SyncWrap
 
@@ -26,6 +27,7 @@ module SyncWrap
   # Host component dependencies: RunUser?, SourceTree?, BundlerGem
   class Bundle < Component
     include PathUtil
+    include ChangeKeyListener
 
     # Path to the Gemfile(.lock)
     # (Default: SourceTree#remote_source_path)
@@ -45,10 +47,6 @@ module SyncWrap
 
     protected
 
-    # An optional state key to check, indicating changes requiring
-    # bundle install (Default: nil; Example: :source_tree)
-    attr_accessor :change_key
-
     # Hash of environment key/values to set on call to bundle install
     # (Default: {} -> none)
     attr_accessor :bundle_install_env
@@ -69,7 +67,6 @@ module SyncWrap
     public
 
     def initialize( opts = {} )
-      @change_key = nil
       @bundle_path = nil
       @bundle_install_env = {}
       @bundle_install_path = '~/.gem'
@@ -79,7 +76,7 @@ module SyncWrap
     end
 
     def install
-      bundle_install if change_key.nil? || state[ change_key ]
+      bundle_install if change_key.nil? || change_key_changes?
     end
 
     def bundle_install

data/lib/syncwrap/components/bundled_iyyov_daemon.rb

@@ -15,6 +15,7 @@
 #++
 
 require 'syncwrap/component'
+require 'syncwrap/change_key_listener'
 
 module SyncWrap
 
@@ -30,6 +31,7 @@ module SyncWrap
   #
   # Host component dependencies: RunUser, <ruby>, Iyyov
   class BundledIyyovDaemon < Component
+    include ChangeKeyListener
 
     protected
 
@@ -44,16 +46,11 @@ module SyncWrap
     # one of 'name' on a host. (Default: nil)
     attr_accessor :instance
 
-    # An optional state key to check, indicating changes requiring
-    # a daemon restart (Default: nil; Example: :source_tree)
-    attr_accessor :change_key
-
     public
 
     def initialize( opts = {} )
       @name = nil
       @instance = nil
-      @change_key = nil
 
       super
     end
@@ -76,9 +73,7 @@ module SyncWrap
                           user: run_user )
       job_changes += iyyov_install_jobs
 
-      src_changes = ( change_key && state[ change_key ] ) || []
-
-      if ( ( src_changes + conf_changes ).length > 0 ||
+      if ( change_key_changes? || !conf_changes.empty? ||
            state[ :hashdot_updated ] ||
            state[ :imaging ] )
         rudo( "kill $(< #{daemon_service_dir}/#{name}.pid ) || true" )

data/lib/syncwrap/components/bundler_gem.rb

@@ -24,11 +24,11 @@ module SyncWrap
   #
   class BundlerGem < Component
 
-    # Bundler version to install (Default: 1.6.5)
+    # Bundler version to install (Default: 1.12.5)
     attr_accessor :bundler_version
 
     def initialize( opts = {} )
-      @bundler_version = '1.6.5'
+      @bundler_version = '1.12.5'
       super
     end
 

data/lib/syncwrap/components/cruby_vm.rb

@@ -36,7 +36,7 @@ module SyncWrap
   # some common utility methods.
   #
   # Alternatives like RVM, rbenv, etc. are disfavored by this author
-  # for server provisioning because of their often arcane shell and
+  # for server provisioning because of their intrusive shell and
   # environment modifications and obscure interations with non-/login
   # or non-/interactive sessions. These are fine tools if needed for
   # development however. Again you are currently on your own (beyond
@@ -47,22 +47,26 @@ module SyncWrap
     include HashSupport
 
     # Default #ruby_version to install
-    DEFAULT_VERSION = '2.1.8'
+    DEFAULT_VERSION = '2.1.10'
 
     # A set of known (sha256) cryptographic hashes, keyed by version
-    # string.
+    # string, for the source ruby-(version).tar.gz package.
     KNOWN_HASHES = {
       '2.1.7' =>
       'f59c1596ac39cc7e60126e7d3698c19f482f04060674fdfe0124e1752ba6dd81',
       '2.1.8' =>
-      'afd832b8d5ecb2e3e1477ec6a9408fdf9898ee73e4c5df17a2b2cb36bd1c355d' }
+      'afd832b8d5ecb2e3e1477ec6a9408fdf9898ee73e4c5df17a2b2cb36bd1c355d',
+      '2.1.10' =>
+      'fb2e454d7a5e5a39eb54db0ec666f53eeb6edc593d1d2b970ae4d150b831dd20',
+      '2.2.5' =>
+      '30c4b31697a4ca4ea0c8db8ad30cf45e6690a0f09687e5d483c933c03ca335e3' }
 
     # The ruby version to install, as it appears in source packages
     # from ruby-lang.org. Note that starting with 2.1.0, the patch
     # release (p#) no longer appears in package names.
     # (Default: DEFAULT_VERSION)
     #
-    # Example values: '2.0.0-p481', '2.1.8'
+    # Example values: '2.0.0-p481', '2.1.10', '2.2.5'
     attr_accessor :ruby_version
 
     # If true, attempt to uninstall any pre-existing distro packaged

data/lib/syncwrap/components/debian.rb

@@ -46,7 +46,10 @@ module SyncWrap
     end
 
     def systemd?
-      @systemd ||= version_gte?( debian_version, [8] )
+      if @systemd.nil?
+        @systemd = version_gte?( debian_version, [8] )
+      end
+      @systemd
     end
 
     # Install the specified package names. The first time this is
@@ -56,30 +59,29 @@ module SyncWrap
     # ==== Options
     #
     # :check_install:: Short-circuit if all packages already
-    #                  installed. Thus no upgrades will be performed.
+    #                  installed. Thus no upgrades will be
+    #                  performed. (Default: true)
     #
     # :minimal:: Eqv to --no-install-recommends
     #
-    # Additional options are passed to the sudo calls.
+    # Options are also passed to the sudo calls.
     def dist_install( *args )
-      opts = args.last.is_a?( Hash ) && args.pop.dup || {}
+      opts = args.last.is_a?( Hash ) && args.pop || {}
       args.flatten!
       flags = []
-      flags << '--no-install-recommends' if opts.delete( :minimal )
-      chk = opts.delete( :check_install )
-      chk = opts.delete( :succeed ) if chk.nil?
+      flags << '--no-install-recommends' if opts[ :minimal ]
+      chk = opts[ :check_install ]
       chk = check_install? if chk.nil?
-      dist_if_not_installed?( args, chk, opts ) do
+      dist_if_not_installed?( args, chk != false, opts ) do
         sudo( "apt-get -yqq update", opts ) if first_apt?
         sudo( "apt-get -yq install #{(flags + args).join ' '}", opts )
       end
     end
 
     # Uninstall the specified package names. A trailing hash is
-    # interpreted as options, passed to the sudo calls.
+    # interpreted as options and passed to the sudo calls.
     def dist_uninstall( *pkgs )
-      opts = pkgs.last.is_a?( Hash ) && pkgs.pop.dup || {}
-      opts.delete( :succeed )
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
       pkgs.flatten!
       pkgs.each do |pkg|
         dist_if_installed?( pkg, opts ) do

data/lib/syncwrap/components/iyyov.rb

@@ -41,7 +41,7 @@ module SyncWrap
     # empty jobs.rb.
     def install
       # Shorten if the desired iyyov version is already running
-      pid, ver = capture_running_version( 'iyyov' )
+      _,ver = capture_running_version( 'iyyov' )
       if ver != iyyov_version
         install_run_dir    #as root
         install_iyyov_gem  #as root
@@ -140,6 +140,7 @@ module SyncWrap
     def install_iyyov_init
       if systemd?
         changes = rput( 'etc/systemd/system/iyyov.service', user: :root )
+        systemctl( 'daemon-reload' ) unless changes.empty?
         systemctl( 'enable', 'iyyov.service' )
       else
         rput( 'etc/init.d/iyyov', user: :root,
@@ -150,18 +151,34 @@ module SyncWrap
       end
     end
 
-    def iyyov_start
+    def start
       dist_service( 'iyyov', 'start' )
     end
 
-    def iyyov_stop
+    def stop
       dist_service( 'iyyov', 'stop' )
     end
 
-    def iyyov_restart
+    def restart
       dist_service( 'iyyov', 'restart' )
     end
 
+    # Output the server status (useful via CLI with --verbose)
+    def status
+      dist_service( 'iyyov', 'status' )
+    end
+
+    # Reload server configuration
+    def reload
+      dist_service( 'iyyov', 'reload' )
+    end
+
+    protected
+
+    alias :iyyov_start   :start
+    alias :iyyov_restart :restart
+    alias :iyyov_stop    :stop
+
   end
 
 end

data/lib/syncwrap/components/jruby_vm.rb

@@ -22,8 +22,8 @@ require 'syncwrap/hash_support'
 module SyncWrap
 
   # Provision JRuby (jruby.org - Ruby on the Java Virtual Machine) by
-  # direct download from public S3 repo. Includes utility methods for
-  # checking and installing JRuby gems.
+  # direct download from the public S3 repo. Includes utility methods
+  # for checking and installing JRuby gems.
   #
   # Host component dependencies: <Distro>
   class JRubyVM < Component
@@ -32,14 +32,15 @@ module SyncWrap
     include HashSupport
 
     # Default #jruby_version to install
-    DEFAULT_VERSION = '1.7.23'
+    DEFAULT_VERSION = '1.7.24'
 
     # A set of known cryptographic hashes, keyed by version
     # string. Note, we prefer sha256 but sha1 is what is currently
     # published.
     KNOWN_HASHES = { '1.7.22' => '6b9e310a04ad8173d0d6dbe299da04c0ef85fc15',
                      '1.7.23' => '2b5e796feeed2bcfab02f8bf2ff3d77ca318e310',
-                     '1.7.24' => '0c321d2192768dfec419bee6b44c7190f4db32e1' }
+                     '1.7.24' => '0c321d2192768dfec419bee6b44c7190f4db32e1',
+                     '1.7.25' => 'cd15aef419f97cff274491e53fcfb8b88ec36785' }
 
     # JRuby version to install (default: DEFAULT_VERSION)
     attr_accessor :jruby_version

data/lib/syncwrap/components/postgresql.rb

@@ -80,7 +80,7 @@ module SyncWrap
 
     # Location of postgresql data (and possibly also config) directory.
     # (Default: #pg_default_data_dir)
-    attr_accessor :pg_data_dir
+    attr_writer :pg_data_dir
 
     def pg_data_dir
       @pg_data_dir || pg_default_data_dir
@@ -120,7 +120,11 @@ module SyncWrap
     attr_writer :pg_specify_etc_config
 
     def pg_specify_etc_config
-      @pg_specify_etc_config || distro.is_a?( Debian )
+      if @pg_specify_etc_config.nil?
+        distro.is_a?( Debian )
+      else
+        @pg_specify_etc_config
+      end
     end
 
     # The package names, including \PostgreSQL server of the
@@ -174,10 +178,10 @@ module SyncWrap
     # Shared buffers (Default: '256MB' vs PG: '128MB')
     attr_accessor :shared_buffers
 
-    # Work memory (Default: '128MB' vs PG: '1MB')
+    # Work memory (Default: '128MB' vs PG 9.4+: '4MB')
     attr_accessor :work_mem
 
-    # Maintenance work memory (Default: '128MB' vs PG: '16MB')
+    # Maintenance work memory (Default: '128MB' vs PG 9.4+: '64MB')
     attr_accessor :maintenance_work_mem
 
     # Maximum stack depth (Default: '4MB' vs PG: '2MB')
@@ -245,6 +249,7 @@ module SyncWrap
       @pg_data_dir = nil
       @pg_default_data_dir = nil
       @pg_version = nil
+      @pg_specify_etc_config = nil
       @package_names = nil
       @service_name = 'postgresql'
       @synchronous_commit = :on
@@ -355,20 +360,36 @@ module SyncWrap
     end
 
     # Start the server
-    def pg_start
+    def start
       dist_service( service_name, 'start' )
     end
 
     # Restart the server
-    def pg_restart
+    def restart
       dist_service( service_name, 'restart' )
     end
 
     # Stop the server
-    def pg_stop
+    def stop
       dist_service( service_name, 'stop' )
     end
 
+    # Output the server status (useful via CLI with --verbose)
+    def status
+      dist_service( service_name, 'status' )
+    end
+
+    # Reload server configuration
+    def reload
+      dist_service( service_name, 'reload' )
+    end
+
+    protected
+
+    alias :pg_start   :start
+    alias :pg_restart :restart
+    alias :pg_stop    :stop
+
   end
 
 end