syncwrap 2.8.3 → 2.9.0

data/lib/syncwrap/components/lvm_cache.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -88,16 +88,21 @@ module SyncWrap
     end
 
     def install
-      dist_install( "lvm2", minimal: true )
+      if distro.is_a?( Debian )
+        dist_install( "lvm2", "thin-provisioning-tools", minimal: true )
+      else
+        dist_install( "lvm2", minimal: true )
+      end
       sudo( "if ! lvs /dev/#{vg}/#{lv_cache}; then", close: "fi" ) do
         unmount_device( raw_device )
         sudo <<-SH
           vgextend #{vgextend_flags.join ' '} #{vg} #{raw_device}
           lvcreate -L #{meta_size} -n #{lv_cache_meta} #{vg} #{raw_device}
           lvcreate #{cache_size_flag} -n #{lv_cache} #{vg} #{raw_device}
-          lvconvert --type cache-pool --cachemode writethrough --yes \
+          lvconvert --yes --type cache-pool --cachemode writethrough \
                     --poolmetadata #{vg}/#{lv_cache_meta} #{vg}/#{lv_cache}
-          lvconvert --type cache --cachepool #{vg}/#{lv_cache} #{vg}/#{lv_cache_target}
+          lvconvert --yes --type cache --cachepool #{vg}/#{lv_cache} \
+                    #{vg}/#{lv_cache_target}
         SH
       end
     end

data/lib/syncwrap/components/mdraid.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/components/network.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -58,6 +58,10 @@ module SyncWrap
       else
         set_etc_hostname( name )
       end
+
+      if distro.is_a?( Debian ) && !dns_search
+        set_etc_hosts_name( name )
+      end
     end
 
     # Test if change to etc/hostname is needed. If so also immediately
@@ -71,6 +75,19 @@ module SyncWrap
       SH
     end
 
+    def set_etc_hosts_name( name )
+      f = '/etc/hosts'
+      # If name not already in /etc/hosts append it to the beginning
+      # of the file.
+      sudo <<-SH
+        if ! grep -q -E '\s#{name}(\s|$)' #{f}; then
+          cp -f #{f} #{f}~
+          echo '127.0.0.1 #{name}' > #{f}
+          cat #{f}~ >> #{f}
+        fi
+      SH
+    end
+
     # Test if change to etc/sysconfig/network is needed. If so also
     # immediately set (in kernel) hostname.
     def set_sysconfig_network( name )

data/lib/syncwrap/components/open_jdk.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -19,20 +19,24 @@ require 'syncwrap/component'
 # For distro class comparison only (pre-load for safety)
 require 'syncwrap/components/rhel'
 require 'syncwrap/components/debian'
+require 'syncwrap/components/ubuntu'
 require 'syncwrap/components/arch'
+require 'syncwrap/version_support'
 
 module SyncWrap
 
   # Provision an OpenJDK via Linux distro managed packages.
   #
   # For simplicity, this component only supports the full JDK (runtime
-  # and compiler) and not the JRE (runtime only).  Note however that
-  # on Debian distros, installing 'openjdk-7-jdk' ends up pulling in
-  # X11 and leads to signficant system bloat. See:
+  # and compiler) and not the JRE (runtime only).  Note that
+  # on older Debian-based distros, installing 'openjdk-7-jdk' is
+  # necessary for javac, but ends up pulling X11 and leads to
+  # signficant system bloat. See:
   #
   # https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/257857
   #
-  # On Debian, only the JRE is available "headless".
+  # As of Ubuntu 16.04, there is an 'openjdk-8-jdk-headless' package
+  # which this will use if applicable.
   #
   # Host component dependencies: <Distro>
   #
@@ -40,6 +44,7 @@ module SyncWrap
   # and/or its affiliates.
   # See http://openjdk.java.net/legal/openjdk-trademark-notice.html
   class OpenJDK < Component
+    include VersionSupport
 
     # The JDK major and/or minor version number, i.e "1.7" or "7" is 7.
     # Marketing picked the version scheme.
@@ -66,14 +71,22 @@ module SyncWrap
     end
 
     # Install distro packages, including development headers for JNI
-    # dependet like Hashdot.
+    # dependents like Hashdot.
     def install
       case distro
       when RHEL
         dist_install( "java-1.#{jdk_major_minor}.0-openjdk",
                       "java-1.#{jdk_major_minor}.0-openjdk-devel" )
       when Debian
-        dist_install( "openjdk-#{jdk_major_minor}-jdk" )
+        if jdk_major_minor >= 8 &&
+           distro.is_a?( Ubuntu ) &&
+           version_gte?( distro.ubuntu_version, [16,4] )
+          # FIXME: This jdk-headless package option may be(come)
+          # available on upstream Debian as well.
+          dist_install( "openjdk-#{jdk_major_minor}-jdk-headless" )
+        else
+          dist_install( "openjdk-#{jdk_major_minor}-jdk" )
+        end
       when Arch
         dist_install( "jdk#{jdk_major_minor}-openjdk" )
       else

data/lib/syncwrap/components/postgresql.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -291,13 +291,20 @@ module SyncWrap
     # #shared_memory_max adjustment and stops the server for subsequent
     # reconfigure or data relocation.
     def package_install
-      dist_install( *package_names )
       if distro.is_a?( Debian )
-        pg_stop
+        dist_if_not_installed?( package_names ) do
+          dist_install( *package_names, check_install: false )
+          pg_stop
+        end
         if shared_memory_max
-          rput( 'etc/sysctl.d/61-postgresql-shm.conf', user: :root )
-          sudo "sysctl -p /etc/sysctl.d/61-postgresql-shm.conf"
+          c = rput( 'etc/sysctl.d/61-postgresql-shm.conf', user: :root )
+          unless c.empty?
+            sudo "sysctl -p /etc/sysctl.d/61-postgresql-shm.conf"
+          end
+          c
         end
+      else
+        dist_install( *package_names )
       end
     end
 
@@ -324,10 +331,12 @@ module SyncWrap
       when Debian
         unless pg_data_dir == pg_default_data_dir
           sudo <<-SH
-            mkdir -p #{pg_data_dir}
-            chown postgres:postgres #{pg_data_dir}
-            chmod 700 #{pg_data_dir}
-            mv #{pg_default_data_dir}/* #{pg_data_dir}/
+            if [ ! -d '#{pg_data_dir}/base' ]; then
+               mkdir -p #{pg_data_dir}
+               chown postgres:postgres #{pg_data_dir}
+               chmod 700 #{pg_data_dir}
+               mv #{pg_default_data_dir}/* #{pg_data_dir}/
+            fi
           SH
         end
       else

data/lib/syncwrap/components/puma.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/components/qpid.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/components/rake_gem.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/components/rhel.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -121,7 +121,7 @@ module SyncWrap
     # If chk is true, then wrap block in a sudo bash conditional that tests
     # if any specified pkgs are not installed. Otherwise just
     # yield to block.
-    def dist_if_not_installed?( pkgs, chk, opts, &block )
+    def dist_if_not_installed?( pkgs, chk = true, opts = {}, &block )
       if chk
         pkgs = Array( pkgs )
         cnt = "rpm -q #{pkgs.join ' '} | grep -cv 'not installed'"

data/lib/syncwrap/components/run_user.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/components/source_tree.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/components/tarpit_gem.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/components/ubuntu.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/components/users.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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
@@ -16,6 +16,7 @@
 
 require 'syncwrap/component'
 require 'syncwrap/path_util'
+require 'syncwrap/sudoers'
 
 module SyncWrap
 
@@ -23,6 +24,7 @@ module SyncWrap
   # home directory files.
   class Users < Component
     include PathUtil
+    include Sudoers
 
     # The list of user names to install. If default nil, home_users
     # will be determined by the set of home directories found in
@@ -165,19 +167,7 @@ module SyncWrap
     end
 
     def set_sudoers( user )
-      #FIXME: Use local_root for secure_path? (Order issue)
-
-      sudo <<-SH
-        echo '#{user} ALL=(ALL) NOPASSWD:ALL'  > /etc/sudoers.d/#{user}
-        echo 'Defaults:#{user} !requiretty'   >> /etc/sudoers.d/#{user}
-        echo 'Defaults:#{user} secure_path = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin' \
-          >> /etc/sudoers.d/#{user}
-        chmod 440 /etc/sudoers.d/#{user}
-      SH
-
-      #FIXME: Centos 6.5:
-      # secure_path is the same as above already
-      #FIXME: echo 'Defaults:#{user} always_set_home' >> /etc/sudoers.d/#{user}
+      sudo sudoers_d_commands( user )
     end
 
     protected

data/lib/syncwrap/context.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/distro.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/formatter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/git_help.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/hash_support.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/host.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/main.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/path_util.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/rsync.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/ruby_support.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/shell.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2016 David Kellum
+# Copyright (c) 2011-2017 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

data/lib/syncwrap/sudoers.rb

@@ -0,0 +1,67 @@
+#--
+# Copyright (c) 2011-2017 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
+
+  # Utility methods for generating sudoers.d config
+  module Sudoers
+
+    # Default paths array for sudoers secure_path (PATH setting) As
+    # compared with RHEL derivatives this has /usr/local support and
+    # retains /bin for distro's like Debian that have kept those
+    # separate.  As compared with recent Ubuntu, this is the same
+    # other than avoiding '/snap/bin'.
+    SECURE_PATH = %w[ /usr/local/sbin
+                      /usr/local/bin
+                      /usr/sbin
+                      /usr/bin
+                      /sbin
+                      /bin ].freeze
+
+    protected
+
+    # Return an sh script, including 'shebang' preamble, for writing
+    # the file /etc/sudoers.d/<user>
+    def sudoers_d_script( user, opts = {} )
+      "#!/bin/sh -e\n" + sudoers_d_commands( user, opts )
+    end
+
+    # Return sh command lines string for writing the file
+    # /etc/sudoers.d/<user>
+    def sudoers_d_commands( user, opts = {} )
+      sh = []
+      sh << "cat > /etc/sudoers.d/#{user} <<_CONF_"
+      sh += sudoers_d_template( user, opts )
+      sh << "_CONF_"
+      sh << "chmod 440 /etc/sudoers.d/#{user}"
+      sh.join( "\n" )
+    end
+
+    # Return /etc/sudoers.d/<users> compatible config lines for user
+    # and possible options, as an array
+    def sudoers_d_template( user, opts = {} )
+      spath = opts[:secure_path] || SECURE_PATH
+      spath = spath.join(':') if spath.is_a?( Array )
+
+      [ "#{user} ALL=(ALL) NOPASSWD:ALL",
+        "Defaults:#{user} !requiretty",
+        "Defaults:#{user} always_set_home",  # Default only on RHEL*
+        "Defaults:#{user} secure_path = #{spath}" ]
+    end
+
+  end
+
+end