foreman_maintain 1.7.14 → 1.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35f9b342d0c7de2d288870f2ec1612abef36f3f966b87e1380766a6559e3ab39
-  data.tar.gz: 596e1552a72dcdff40a03eef29ed22c4cc4307f9426a0653836a45f5146b5018
+  metadata.gz: 8c390fa4ecda79655a394437027cd9d917ce2571f4b98c8c861db67af7e4ae1f
+  data.tar.gz: f613773fbf8954a8c16f31671454cfe903c8b8227678d73789acfb2a6d8e5157
 SHA512:
-  metadata.gz: 440a16953ba3b289d989fa7cbc0f9a0ef852fc822601d0be5d7785abf8bf069b9344436e94b4c89691493e94703ac6627110b9afdaeccd01ef90ac2a34da7bee
-  data.tar.gz: 7a179118880980a5fac803379d02013d5927817127addf21331940aa8ee19e5f57a7f0bd059cf98f885b9aa7024f07b579951b72da949af655149a9d7a10bbb0
+  metadata.gz: '0827faab275df357c54526ab2d605929944e3a3907ec049b4ce0487ea0a9ac24d6629e55b6a7e9e25b3a7aeadf3692af788eeb603269126e7f2f8d4922ed872e'
+  data.tar.gz: b9db15bc6b126d55ca288a9b6200b4d754a2ad4f45c34a466d9e3894a7cd86b7c02b66a516dcefb9ef6a6acd3f86e2f22dc57862dee583f49cff7018585ec523

data/definitions/features/puppet_server.rb

@@ -3,7 +3,10 @@ class Features::PuppetServer < ForemanMaintain::Feature
     label :puppet_server
 
     confine do
-      find_package('puppet-server') || find_package('puppetserver') || find_package('puppet')
+      find_package('puppet-server') ||
+        find_package('openvox-server') ||
+        find_package('puppetserver') ||
+        find_package('puppet')
     end
   end
 
@@ -23,7 +26,13 @@ class Features::PuppetServer < ForemanMaintain::Feature
     # We only check puppetserver and not puppet-server, as puppet-server
     # is a part of httpd and relies on httpd service to restart, therefore
     # not requiring a separate service to restart
-    find_package('puppetserver') ? [system_service('puppetserver', 30)] : []
+    return [system_service('puppetserver', 30)] if find_package('puppetserver') ||
+                                                   find_package('openvox-server')
+    []
+  end
+
+  def openvox?
+    find_package('openvox-server')
   end
 
   def puppet_version

data/definitions/procedures/restore/required_packages.rb

@@ -12,6 +12,7 @@ module Procedures::Restore
       backup = ForemanMaintain::Utils::Backup.new(@backup_dir)
       required_packages = []
       required_packages << 'puppetserver' if backup.with_puppetserver?
+      required_packages << 'openvox-server' if backup.with_openvoxserver?
       if required_packages.any?
         with_spinner('Installing required packages') do
           ForemanMaintain.package_manager.install(required_packages, assumeyes: true)

data/lib/foreman_maintain/utils/backup.rb

@@ -256,6 +256,10 @@ module ForemanMaintain
         installed_rpms.any? { |rpm| rpm.start_with?('puppetserver-') }
       end
 
+      def with_openvoxserver?
+        installed_rpms.any? { |rpm| rpm.start_with?('openvox-server-') }
+      end
+
       def source_os_version
         metadata.fetch('os_version', 'unknown')
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.14'.freeze
+  VERSION = '1.7.15'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.7.14
+  version: 1.7.15
 platform: ruby
 authors:
 - Ivan Nečas
@@ -429,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []