syncwrap 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081970fc00b932bd2296f5a2678b029a2ce0d89d
-  data.tar.gz: 74a6e24b78b9983bc8b54c2486d997a62b08efd4
+  metadata.gz: 00df7a5da1c7959e0e8536ef2c2365b834d2fa8d
+  data.tar.gz: 95e52e386b6f40581e445b4385ee1396159cf219
 SHA512:
-  metadata.gz: 1831e1c8dfeae16ee2b24d56bfb6388bbd468cbb381e974d05adf6b7c198495f8b2c6d30a9d75f58ab19c4da1f715fe3e84500b5ed098a55fe8c0c477a5f3252
-  data.tar.gz: 459cbbf8efd87fef6fa95692caa6ab72886b4d72f70c6e65d72af351452dae89de978c1e04fd267bf211de1080764a40b84a36f9ce6cc276c605fbe143ca4f1c
+  metadata.gz: 7b558fac6b8e8e7c8a5797c5762efbfa2380671d35b061353aa4a04b5fb918eea2c9a92b74458c078dca2c22ad08dfc0b94d2b5c4d45a5984e6b6d42b3a4f590
+  data.tar.gz: 68c4f6387575c2ecabc185799949f545975c3786013f06343052d64330cfc6ad30fdc06676e93db585595b16a10a7e18762a589fe81513334d94d7ba95e07645

data/History.rdoc

@@ -1,3 +1,22 @@
+=== 2.6.0 (2015-11-13)
+* Add SyncWrap::LVMCache component, with
+  SyncWrap::Distro#unmount_device moved from MDRaid.
+* Add SyncWrap::Space#compose (and main) utility for sync file inline
+  components.
+* Add systemd support for all distros: Arch, RHEL/CentOS 7+, and by
+  default, Debian 8+ and Ubuntu 15.04+ via the SyncWrap::SystemD
+  module. See also various updates in SyncWrap::Distro.
+* Add SyncWrap::Iyyov systemd service unit file and install support.
+* Add SyncWrap::Puma systemd service unit file and install support.
+* Add cryptographic hash verification support to SyncWrap::CRubyVM,
+  SyncWrap::JRubyVM, SyncWrap::Hashdot, and SyncWrap::CommercialJDK.
+* Add -R/--components-in-role flag support in CLI to limit components
+  executed to those contained by one or more roles.
+* Upgrade SyncWrap::JRubyVM default version to 1.7.22
+* Upgrade SyncWrap::CRubyVM default version to 2.1.7
+* Move AmazonEC2.ec2_user_data to SyncWrap::UserData module for
+  broader use.
+
 === 2.5.1 (2015-10-19)
 * Add SyncWrap::RHEL#dist_uninstall :succeed flag for removing
   packages which may not exist

data/Manifest.txt

@@ -24,12 +24,15 @@ lib/syncwrap/context.rb
 lib/syncwrap/distro.rb
 lib/syncwrap/formatter.rb
 lib/syncwrap/git_help.rb
+lib/syncwrap/hash_support.rb
 lib/syncwrap/host.rb
 lib/syncwrap/main.rb
 lib/syncwrap/path_util.rb
 lib/syncwrap/rsync.rb
 lib/syncwrap/ruby_support.rb
 lib/syncwrap/shell.rb
+lib/syncwrap/systemd.rb
+lib/syncwrap/user_data.rb
 lib/syncwrap/version_support.rb
 lib/syncwrap/components/amazon_linux.rb
 lib/syncwrap/components/arch.rb
@@ -46,6 +49,7 @@ lib/syncwrap/components/hashdot.rb
 lib/syncwrap/components/iyyov.rb
 lib/syncwrap/components/iyyov_daemon.rb
 lib/syncwrap/components/jruby_vm.rb
+lib/syncwrap/components/lvm_cache.rb
 lib/syncwrap/components/mdraid.rb
 lib/syncwrap/components/network.rb
 lib/syncwrap/components/open_jdk.rb
@@ -67,6 +71,8 @@ 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.erb
+sync/etc/systemd/system/iyyov.service.erb
+sync/etc/systemd/system/puma.service.erb
 sync/jruby/bin/jgem
 sync/postgresql/environment
 sync/postgresql/pg_ctl.conf

data/README.rdoc

@@ -91,7 +91,8 @@ like dist_install and other distribution-specific behaviors:
 
 Components implementing \#install:
 
-* SyncWrap::MDRaid - Software raid, lvm volumes, filesystems, mounts
+* SyncWrap::MDRaid, SyncWrap::LVMCache - Software raid, lvm volumes,
+  lvm cache, filesystems, mounts
 
 * SyncWrap::Network and SyncWrap::EtcHosts - hostname, static names,
   resolver config
@@ -127,14 +128,14 @@ Components implementing \#install:
 The above only represents my more recent project needs. Pull requests
 to add, for example, the following would be well received:
 
-* Bluepill
-* Rails (extra credit: without git fetch or per-host asset compile)
+* Rails (based on SourceTree, Bundle and ideally without per-host
+  asset compile)
 * Nginx
 * Mongo
 * Redis
 
-\SyncWrap makes it reasonable to implement any of the above in the
-privacy of your own office.
+\SyncWrap makes it reasonable to implement any of the above
+yourself.
 
 == License
 

data/lib/syncwrap/amazon_ec2.rb

@@ -20,6 +20,7 @@ require 'securerandom'
 require 'syncwrap/amazon_ws'
 require 'syncwrap/path_util'
 require 'syncwrap/host'
+require 'syncwrap/user_data'
 
 module SyncWrap
 
@@ -37,6 +38,7 @@ module SyncWrap
   class AmazonEC2
     include AmazonWS
     include PathUtil
+    include UserData
 
     # FIXME: Interim strategy: use AmazonWS and defer deciding final
     # organization.
@@ -128,7 +130,7 @@ module SyncWrap
       # overrides (like for :availability_zone)?
 
       if profile[ :user_data ] == :ec2_user_sudo
-        profile[ :user_data ] = ec2_user_data
+        profile[ :user_data ] = no_tty_sudoer( 'ec2-user' )
       end
 
       dname = profile.delete( :default_name )
@@ -278,17 +280,6 @@ module SyncWrap
       end
     end
 
-    def ec2_user_data( user = 'ec2-user' )
-      #FIXME: Utility module for this (+ Users sudoers)?
-      script = <<-SH
-        #!/bin/sh -e
-        echo '#{user} ALL=(ALL) NOPASSWD:ALL'  > /etc/sudoers.d/#{user}
-        echo 'Defaults:#{user} !requiretty'   >> /etc/sudoers.d/#{user}
-        chmod 440 /etc/sudoers.d/#{user}
-      SH
-      script.split( "\n" ).map( &:strip ).join( "\n" )
-    end
-
   end
 
 end

data/lib/syncwrap/base.rb

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

data/lib/syncwrap/cli.rb

@@ -31,6 +31,7 @@ module SyncWrap
       @list_components = false
       @component_plan = []
       @roles = []
+      @comp_roles = []
       @host_patterns = []
       @create_plan = []
       @image_plan = []
@@ -69,6 +70,11 @@ TEXT
           @roles << r.sub(/^:/,'').to_sym
         end
 
+        opts.on( "-R", "--components-in-role ROLE",
+                 "Constrain components by ROLE (may use multiple)" ) do |r|
+          @comp_roles << r.sub(/^:/,'').to_sym
+        end
+
         opts.on( "-t", "--threads N",
                  "The number of hosts to process concurrently",
                  "(default: all hosts)",
@@ -270,6 +276,10 @@ TEXT
 
       exit( 0 ) if lists > 0
 
+      unless @comp_roles.empty?
+        @options[ :comp_roles ] = @comp_roles
+      end
+
       success = space.execute( @hosts, @component_plan, @options )
       exit( success ? 0 : 1 )
     end

data/lib/syncwrap/components/arch.rb

@@ -16,12 +16,18 @@
 
 require 'syncwrap/component'
 require 'syncwrap/distro'
+require 'syncwrap/systemd'
 
 module SyncWrap
 
   # \Arch Linux distro, partial implementation for pacman.
   class Arch < Component
-    include SyncWrap::Distro
+    include Distro
+    include SystemD
+
+    def systemd?
+      true
+    end
 
     def dist_install( *pkgs )
       opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
@@ -33,6 +39,7 @@ module SyncWrap
       sudo "pacman -R --noconfirm #{pkgs.join ' '}"
     end
 
+    alias_method :dist_service, :dist_service_via_systemctl
   end
 
 end

data/lib/syncwrap/components/commercial_jdk.rb

@@ -15,6 +15,7 @@
 #++
 
 require 'syncwrap/component'
+require 'syncwrap/hash_support'
 
 module SyncWrap
 
@@ -30,6 +31,7 @@ module SyncWrap
   #
   # Host component dependencies: <Distro>
   class CommercialJDK < Component
+    include HashSupport
 
     # HTTP URL to repo base directory. Note that the default
     # (http://localhost/repo) is unlikely to work here.
@@ -40,10 +42,15 @@ module SyncWrap
     # directory when unpackaged.
     attr_accessor :jdk_name
 
+    # An optional cryptographic hash value (hexadecimal, some standard
+    # length) to use for verifying the 'jdk_name.tar.gz' package.
+    # Default: nil (no verification)
+    attr_accessor :hash
+
     def initialize( opts = {} )
       @java_repo_base_url = 'http://localhost/repo'
       @jdk_name = 'jrs-ora-1.7.0_51-x64'
-
+      @hash = nil
       super
     end
 
@@ -58,17 +65,25 @@ module SyncWrap
     end
 
     def install
+      distro = "/tmp/#{jdk_name}.tar.gz"
       bins = %w[ java jmap jstack jstat jps jinfo jhat javac ].
         map { |b| "../lib/java/bin/#{b}" }.
         join( ' ' )
 
-      sudo <<-SH
-        if [ ! -d #{jdk_dir} ]; then
-          curl -sSL #{jdk_url} | tar -C #{local_root}/lib -zxf -
+      sudo( "if [ ! -d #{jdk_dir} ]; then", close: "fi" ) do
+        sudo <<-SH
+          curl -sSL -o #{distro} #{jdk_url}
+        SH
+
+        hash_verify( hash, distro, user: :root ) if hash
+
+        sudo <<-SH
+          tar -C #{local_root}/lib -zxf #{distro}
+          rm -f #{distro}
           cd #{local_root}/lib && ln -sfn #{jdk_name} java
           cd #{local_root}/bin && ln -sfn #{bins} .
-        fi
-      SH
+        SH
+      end
     end
 
   end

data/lib/syncwrap/components/cruby_vm.rb

@@ -18,6 +18,7 @@ require 'syncwrap/component'
 require 'syncwrap/components/rhel'
 require 'syncwrap/ruby_support'
 require 'syncwrap/version_support'
+require 'syncwrap/hash_support'
 
 module SyncWrap
 
@@ -43,13 +44,21 @@ module SyncWrap
   class CRubyVM < Component
     include VersionSupport
     include RubySupport
+    include HashSupport
+
+    # Default version of #ruby_version to install
+    DEFAULT_VERSION = '2.1.7'
+
+    # SHA256 #hash for DEFAULT_VERSION
+    DEFAULT_VERSION_HASH =
+      'f59c1596ac39cc7e60126e7d3698c19f482f04060674fdfe0124e1752ba6dd81'
 
     # 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: 2.1.5)
+    # (Default: DEFAULT_VERSION)
     #
-    # Example values: '2.0.0-p481', '2.1.5'
+    # Example values: '2.0.0-p481', '2.1.7'
     attr_accessor :ruby_version
 
     # If true, attempt to uninstall any pre-existing distro packaged
@@ -57,13 +66,21 @@ module SyncWrap
     # (Default: true)
     attr_accessor :do_uninstall_distro_ruby
 
+    # A cryptographic hash value (hexadecimal, some standard length)
+    # to use for verifying the 'source.tar.gz' package.
+    attr_writer :hash
+
     def initialize( opts = {} )
-      @ruby_version = "2.1.5"
+      @ruby_version = DEFAULT_VERSION
       @do_uninstall_distro_ruby = true
-
+      @hash = nil
       super
     end
 
+    def hash
+      @hash || ( ruby_version == DEFAULT_VERSION && DEFAULT_VERSION_HASH )
+    end
+
     def install
       install_ruby
       install_gemrc # from RubySupport
@@ -134,11 +151,19 @@ module SyncWrap
       # Arguably all but the final install should be run by an
       # unprivileged user. But its more likely merged this way, and if
       # "configure" or "make" can be exploited, so can "make install".
+      sfile = File.basename( src_url )
       sudo <<-SH
         [ -e /tmp/src ] && rm -rf /tmp/src || true
         mkdir -p /tmp/src/ruby
         cd /tmp/src/ruby
-        curl -sSL #{src_url} | tar -zxf -
+        curl -sSL -o #{sfile} #{src_url}
+      SH
+
+      hash_verify( hash, sfile, user: :root ) if hash
+
+      sudo <<-SH
+        tar -zxf #{sfile}
+        rm -f #{sfile}
         cd ruby-#{ruby_version}
         ./configure --prefix=#{local_root} #{redirect?}
         make #{redirect?}

data/lib/syncwrap/components/debian.rb

@@ -17,24 +17,38 @@
 require 'syncwrap/component'
 require 'syncwrap/distro'
 require 'syncwrap/version_support'
+require 'syncwrap/systemd'
 
 module SyncWrap
 
   # Customizations for \Debian and possibly other deb packaged
   # derivatives. Specific distros/versions may further specialize.
   class Debian < Component
-    include SyncWrap::Distro
-    include SyncWrap::VersionSupport
+    include Distro
+    include VersionSupport
+    include SystemD
 
     # Debian version, i.e. '7.6' No default value.
     attr_accessor :debian_version
 
     alias :distro_version :debian_version
 
+    protected
+
+    # Set true/false to override the default, distro version based
+    # determination of whether systemd is PID 1 on the system.
+    attr_writer :systemd
+
+    public
+
     def initialize( opts = {} )
       super
     end
 
+    def systemd?
+      @systemd ||= version_gte?( debian_version, [8] )
+    end
+
     # Install the specified package names. The first time this is
     # applied to any given host, an "apt-get update" is issued as
     # well.  A trailing hash is interpreted as options, see below.
@@ -63,15 +77,25 @@ module SyncWrap
       sudo "/usr/sbin/update-rc.d #{name} defaults"
     end
 
-    # Enable the System V style init.d service
+    # Enable a service by (short) name either via Debian/System V
+    # `update-rc.d` or systemd `systemctl enable`.
     def dist_enable_init_service( name )
-      sudo "/usr/sbin/update-rc.d #{name} enable"
+      if systemd?
+        systemctl( 'enable', dot_service( name ) )
+      else
+        sudo "/usr/sbin/update-rc.d #{name} enable"
+      end
     end
 
-    # Run via sudo, the service command typically supporting 'start',
-    # 'stop', 'restart', 'status', etc. arguments.
+    # Run the service command typically supporting 'start', 'stop',
+    # 'restart', 'status', etc. actions.
+    # Arguments are in order: shortname, action
     def dist_service( *args )
-      sudo( [ '/usr/sbin/service', *args ].join( ' ' ) )
+      if systemd?
+        dist_service_via_systemctl( *args )
+      else
+        sudo( [ '/usr/sbin/service', *args ].join( ' ' ) )
+      end
     end
 
     protected

data/lib/syncwrap/components/hashdot.rb

@@ -15,9 +15,11 @@
 #++
 
 require 'syncwrap/component'
+require 'syncwrap/hash_support'
 
 # For distro class comparison only (pre-load for safety)
 require 'syncwrap/components/debian'
+require 'syncwrap/components/rhel'
 
 module SyncWrap
 
@@ -26,16 +28,32 @@ module SyncWrap
   #
   # Host component dependencies: <Distro>, <JDK>, JRubyVM
   class Hashdot < Component
+    include HashSupport
 
-    # Hashdot version (default: 1.4.0)
+    # Default version of #hashdot_version to install
+    DEFAULT_VERSION = '1.4.0'
+
+    # SHA256 #hash for DEFAULT_VERSION
+    DEFAULT_VERSION_HASH =
+      '131e01b4ee2c6f63c4850bbcb71a83f902646436b4791a8717cc76efe26afab7'
+
+    # Hashdot version (default: DEFAULT_VERSION)
     attr_accessor :hashdot_version
 
-    def initialize( opts = {} )
-      @hashdot_version = '1.4.0'
+    # A cryptographic hash value (hexadecimal, some standard length)
+    # to use for verifying the 'hashdot-*-src.tar.gz' package.
+    attr_writer :hash
 
+    def initialize( opts = {} )
+      @hashdot_version = DEFAULT_VERSION
+      @hash = nil
       super
     end
 
+    def hash
+      @hash || ( hashdot_version == DEFAULT_VERSION && DEFAULT_VERSION_HASH )
+    end
+
     def hashdot_bin_url
       [ 'http://downloads.sourceforge.net/project/hashdot/hashdot',
         hashdot_version,
@@ -92,11 +110,18 @@ module SyncWrap
     def install_hashdot
       src_root = '/tmp/src/hashdot'
       src = "#{src_root}/hashdot-#{hashdot_version}"
+      sfile = "#{src_root}/hashdot-#{hashdot_version}-src.tar.gz"
 
       sh <<-SH
         sudo rm -rf /tmp/src
         mkdir -p #{src_root}
-        curl -sSL #{hashdot_bin_url} | tar -C #{src_root} -zxf -
+        curl -sSL -o #{sfile} #{hashdot_bin_url}
+      SH
+
+      hash_verify( hash, sfile ) if hash
+
+      sh <<-SH
+        tar -C #{src_root} -zxf #{sfile}
       SH
 
       rput( 'src/hashdot/', "#{src}/", :excludes => :dev )
@@ -105,6 +130,7 @@ module SyncWrap
         cd #{src}
         make
         sudo make install
+        rm -rf #{src_root}
       SH
 
     end

data/lib/syncwrap/components/iyyov.rb

@@ -37,7 +37,8 @@ module SyncWrap
       super
     end
 
-    # Deploy iyyov gem, init.d/iyyov and at least an empty jobs.rb.
+    # Deploy iyyov gem, init.d script or systemd unit, and at least an
+    # empty jobs.rb.
     def install
       # Shorten if the desired iyyov version is already running
       pid, ver = capture_running_version( 'iyyov' )
@@ -130,18 +131,23 @@ module SyncWrap
       SH
     end
 
-    # Ensure install of same gem version as init.d/iyyov script
+    # Ensure install of same gem version as init.d script or unit file
     def install_iyyov_gem
       jruby_gem_install( 'iyyov', version: iyyov_version )
     end
 
-    # Install iyyov daemon init.d script and add to init daemons
+    # Install iyyov daemon init.d script or service unit
     def install_iyyov_init
-      rput( 'etc/init.d/iyyov', user: :root,
-            erb_vars: { lsb: distro.kind_of?( Debian ) } )
+      if systemd?
+        changes = rput( 'etc/systemd/system/iyyov.service', user: :root )
+        systemctl( 'enable', 'iyyov.service' )
+      else
+        rput( 'etc/init.d/iyyov', user: :root,
+              erb_vars: { lsb: distro.kind_of?( Debian ) } )
 
-      # Add to init.d
-      dist_install_init_service( 'iyyov' )
+        # Add to init.d
+        dist_install_init_service( 'iyyov' )
+      end
     end
 
     def iyyov_start

data/lib/syncwrap/components/jruby_vm.rb

@@ -17,6 +17,7 @@
 require 'syncwrap/component'
 require 'syncwrap/ruby_support'
 require 'syncwrap/version_support'
+require 'syncwrap/hash_support'
 
 module SyncWrap
 
@@ -28,17 +29,33 @@ module SyncWrap
   class JRubyVM < Component
     include VersionSupport
     include RubySupport
+    include HashSupport
 
-    # JRuby version to install (default: 1.7.19)
+    # Default version of #jruby_version to install
+    DEFAULT_VERSION = '1.7.22'
+
+    # The #hash for DEFAULT_VERSION. Prefer sha256 but sha1 is what is
+    # currently published.
+    DEFAULT_VERSION_HASH = '6b9e310a04ad8173d0d6dbe299da04c0ef85fc15'
+
+    # JRuby version to install (default: DEFAULT_VERSION)
     attr_accessor :jruby_version
 
-    def initialize( opts = {} )
-      @jruby_version = '1.7.19'
+    # A cryptographic hash value (hexadecimal, some standard length)
+    # to use for verifying the 'jruby-bin-*.tar.gz' package.
+    attr_writer :hash
 
+    def initialize( opts = {} )
+      @jruby_version = DEFAULT_VERSION
+      @hash = nil
       super( { ruby_command: 'jruby',
                 gem_command: 'jgem' }.merge( opts ) )
     end
 
+    def hash
+      @hash || ( jruby_version == DEFAULT_VERSION && DEFAULT_VERSION_HASH )
+    end
+
     def jruby_dist_path
       "#{local_root}/lib/jruby/jruby-#{jruby_version}"
     end
@@ -67,12 +84,20 @@ module SyncWrap
     def jruby_install
 
       root = "#{local_root}/lib/jruby"
+      distro = "/tmp/jruby-bin-#{jruby_version}.tar.gz"
 
       sudo <<-SH
         if [ ! -d #{jruby_dist_path} ]; then
           mkdir -p #{root}
           mkdir -p #{root}/gems
-          curl -sSL #{jruby_bin_url} | tar -C #{root} -zxf -
+          curl -sSL -o #{distro} #{jruby_bin_url}
+      SH
+
+      hash_verify( hash, distro, user: :root ) if hash
+
+      sudo <<-SH
+          tar -C #{root} -zxf #{distro}
+          rm -f #{distro}
           mkdir -p #{gemrc_path}
           cd #{root} && ln -sfn jruby-#{jruby_version} jruby
           cd #{local_root}/bin && ln -sf ../lib/jruby/jruby/bin/jirb .