foreman_maintain 1.10.5 → 1.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0885ff686d1f9c5bb03c5cfa7f32e8da07cd5032dc0cd2f9631f716d8db688d7'
-  data.tar.gz: f07a9ea59b4dc4723a7e3f2a786269de44fe10d633b9add1b077ae8602d23545
+  metadata.gz: 2720755d4885da315eea59fb0ca45865830fb1fcdd1f7f957d4e0e08f4c2f9a4
+  data.tar.gz: bf1fd8cae788e546bd3c6624e064a3f4cf38a0a70ef7743b446d381242262d2a
 SHA512:
-  metadata.gz: 70370ebf76c611e79113ad7068ee60907a674e130178635aa1c5c885618a56b765cce656d1efcedaf2f77b76d216a655758fdee85ba57287beb37eba86e09e2e
-  data.tar.gz: f6db48e5c475b4117d278f851217332d824bc0e6f052c46308780ad95984650f1eeea1a2b5874b170a0d0b592672f78dd9577d8453effc4f0207a4825212a73d
+  metadata.gz: b780c5babc78764365a2e1c4c74ff873ad4013b2746ddcafaad0b1b667ed8d9e3d1baedabb739c30c3d07ee139a5e775b1275d20037d86d437d8586c3ac15741
+  data.tar.gz: fcc515159a6e957bb00b2140c7f89593923bbcc544ecfcbf6a3da51f7ea6b4576d45819da4e54e3ed6039b365c26e6b01974e757015c66a1a40b450bd71a6647

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 find_empty_cacert_request_files

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

@@ -203,6 +203,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.10.5'.freeze
+  VERSION = '1.10.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.10.5
+  version: 1.10.6
 platform: ruby
 authors:
 - Ivan Nečas
@@ -447,7 +447,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: []