foreman_maintain 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a9aa2cfbc30718a86ed4e30a33b512666147926b9f8dbc34b3e34f311167601
-  data.tar.gz: 869ebe7840ade6dddd3f657ecd9878be6a64411dcf9626779f8357954f7cef4b
+  metadata.gz: 5e987c2a5c95bc27df7b64d739c05cd6779041dc417f13934586931d9e966889
+  data.tar.gz: 8a5e15f6c859d19b8392e620de886d18173327627ee79cf26732ae928fb79aff
 SHA512:
-  metadata.gz: c58b43e156c4fa59e3398ad4c792031c948229aaa0f31a429dc14a03ad54c765885833e90f1567686544d3ed3b44f463b87f23f43efe420baf56376c0066af0d
-  data.tar.gz: b28fd0788ddde4c8ef47f39987fa9f187ec5c634d30633bf335c9a8daf3f0bc53fe1ecf1f4b02579ae749e74a0c475c0033e2c759bd05ba71e8a730e262b7d15
+  metadata.gz: 7455550b50b9d07f3eb1b25a822624376b24f78f539c111ed88013bbc862811ea9da0984d57787ac292e579ae0a0778916b17698a9194c9ece457122986363f1
+  data.tar.gz: c70bc731147c15cc1d5bd177cf971d27dfdc096326b6268b7e4c21d95f75275043dbb528dce3ca1866293148c9f6f68aa47bb9370834e51595f804b0e7d3254a

data/extras/foreman_protector/foreman-protector.py

@@ -80,6 +80,7 @@ def exclude_hook(conduit):
                         'WARNING: Excluding %d update%s due to foreman-protector. \n'
                         'Use foreman-maintain packages install/update <package> \n'
                         'to safely install packages without restrictions.\n'
+                        'Use foreman-maintain upgrade run for full upgrade.\n'
                         % (total, suffix))
 
     _add_package_whitelist_excluders(conduit)

data/lib/foreman_maintain/utils/backup.rb

@@ -168,16 +168,15 @@ module ForemanMaintain
       def validate_hostname?
         # make sure that the system hostname is the same as the backup
         config_tarball = file_map[:config_files][:path]
-        config_files = tarball_file_list(config_tarball)
+        tar_cmd = "tar zxf #{config_tarball} etc/httpd/conf/httpd.conf --to-stdout"
+        status, httpd_config = execute_with_status(tar_cmd)
 
         # Incremental backups sometimes don't include httpd.conf. Since a "base" backup
         # is restored before an incremental, we can assume that the hostname is checked
         # during the base backup restore
-        if config_files.include?('etc/httpd/conf/httpd.conf')
-          tar_cmd = "tar zxf #{config_tarball} etc/httpd/conf/httpd.conf " \
-                    "--to-stdout | grep ServerName | awk {'print $2'} | tr -d '\"'"
-          backup_hostname = execute(tar_cmd).chomp
-          backup_hostname == hostname
+        if status == 0
+          match = httpd_config.match(/\s*ServerName\s+"*([^ "]+)"*\s*$/)
+          match ? match[1] == hostname : false
         else
           true
         end
@@ -209,21 +208,6 @@ module ForemanMaintain
       def incremental?
         !!metadata.fetch('incremental', false)
       end
-
-      private
-
-      def tarball_file_list(tarball)
-        # accepts tar.gz files only
-        file_list = []
-        File.open(tarball, 'rb') do |file|
-          ::Zlib::GzipReader.wrap(file) do |gz|
-            ::Gem::Package::TarReader.new(gz) do |tar|
-              tar.each { |entry| file_list << entry.full_name }
-            end
-          end
-        end
-        file_list
-      end
     end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.4.9'.freeze
+  VERSION = '0.4.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp