foreman_maintain 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf9227086619d4fb28185c0fdb796c7045b9f35ea52df8fc3d9aa1a45fbb85d
-  data.tar.gz: 77281b4efd0cb3b2d1e6fed2badce28d183dcb7b16d65246987f57407eb92642
+  metadata.gz: f1b6168d49244a6f59fd0500867fa753c55545cbb299af9c4572ca814d072927
+  data.tar.gz: d5bf3284f717958e4fd3dec1adea6b7f71a67fa854c23457915aeb0417017604
 SHA512:
-  metadata.gz: 3b2e771c53927fa0f637da5a5066eb1afecbfe7876b9a241a68dfc8300ac82f8835fa308a42742d7b2a126716bac825e37179ddd91695a529de0b64e5272e245
-  data.tar.gz: 283f7004e4268f19cadc052dcd044273be28f96e786fd012bca57692276a3765eaded4848a596a66efdfe36d490870f6cfbbee07ccfa4c0dcdcf6362a9fda740
+  metadata.gz: 6d735d3febc81e314bcbe0dc8649536f34998f72aa2b1851c4d568fd90b38cb46dac41dd1ce24d9845c8135abecf90742d0ff9aef6afc03188362420dc1df936
+  data.tar.gz: 4975f14be4a458950c88c3eb3b3edc0fccdd988e134a913c6fb5e7e2dcfdb29dd43ae11dcd5978673d5c0d468c3155a3cd91254d1caed89789038404b034805e

data/definitions/features/apache.rb

@@ -3,17 +3,27 @@ class Features::Apache < ForemanMaintain::Feature
     label :apache
 
     confine do
-      find_package('httpd')
+      find_package(package_name)
     end
   end
 
   def services
     [
-      system_service('httpd', 30)
+      system_service(self.class.package_name, 30)
     ]
   end
 
   def config_files
-    ['/etc/httpd']
+    ["/etc/#{self.class.package_name}"]
+  end
+
+  class << self
+    def package_name
+      if debian?
+        'apache2'
+      else
+        'httpd'
+      end
+    end
   end
 end

data/definitions/features/gofer.rb

@@ -4,7 +4,6 @@ class Features::Gofer < ForemanMaintain::Feature
 
     confine do
       find_package('gofer') &&
-        ForemanMaintain::Utils::Service::Systemd.new('goferd', 0).exist? &&
         ForemanMaintain::Utils::Service::Systemd.new('goferd', 0).enabled?
     end
   end

data/definitions/features/instance.rb

@@ -60,13 +60,13 @@ class Features::Instance < ForemanMaintain::Feature
     end
   end
 
-  def foreman_server_ssl_ca
-    @foreman_server_ssl_ca ||= feature(:installer).answers['foreman']['server_ssl_ca']
+  def server_connection_ca_file
+    @server_connection_ca_file ||= feature(:installer).answers['foreman']['server_ssl_chain']
   end
 
   def server_connection
     net = Net::HTTP.new(ForemanMaintain.config.foreman_url, ForemanMaintain.config.foreman_port)
-    net.ca_file = foreman_server_ssl_ca
+    net.ca_file = server_connection_ca_file
     net.use_ssl = true
     net
   end

data/definitions/features/pulp2.rb

@@ -7,7 +7,6 @@ class Features::Pulp < ForemanMaintain::Feature
 
     confine do
       !check_min_version('katello-common', '4.0') &&
-        ForemanMaintain::Utils::Service::Systemd.new('pulp_resource_manager', 0).exist? &&
         ForemanMaintain::Utils::Service::Systemd.new('pulp_resource_manager', 0).enabled?
     end
   end

data/definitions/features/pulpcore.rb

@@ -5,8 +5,7 @@ class Features::Pulpcore < ForemanMaintain::Feature
     label :pulpcore
 
     confine do
-      ForemanMaintain::Utils::Service::Systemd.new('pulpcore-api', 0).exist? &&
-        ForemanMaintain::Utils::Service::Systemd.new('pulpcore-api', 0).enabled?
+      ForemanMaintain::Utils::Service::Systemd.new('pulpcore-api', 0).enabled?
     end
   end
 

data/definitions/features/salt_server.rb

@@ -0,0 +1,24 @@
+class Features::SaltServer < ForemanMaintain::Feature
+  metadata do
+    label :salt_server
+
+    confine do
+      find_package('salt-master') &&
+        ForemanMaintain::Utils::Service::Systemd.new('salt-master', 0).enabled?
+    end
+  end
+
+  def config_files
+    [
+      '/etc/salt'
+    ]
+  end
+
+  def services
+    salt_services = [system_service('salt-master', 30)]
+    if ForemanMaintain::Utils::Service::Systemd.new('salt-api', 0).enabled?
+      salt_services += [system_service('salt-api', 30)]
+    end
+    salt_services
+  end
+end

data/definitions/procedures/pulp/remove.rb

@@ -23,7 +23,8 @@ module Procedures::Pulp
         '/var/lib/pulp/importers',
         '/var/lib/pulp/uploads',
         '/var/lib/mongodb/',
-        '/var/cache/pulp'
+        '/var/cache/pulp',
+        '/var/spool/squid'
       ].select { |dir| File.directory?(dir) }
     end
 

data/definitions/procedures/restore/installer_reset.rb

@@ -21,7 +21,8 @@ module Procedures::Restore
       # already ran since this is to be run on an existing system, which means installer checks
       # has already been skipped
       if feature(:foreman_proxy) &&
-         feature(:foreman_proxy).with_content?
+         feature(:foreman_proxy).with_content? &&
+         check_max_version('foreman-installer', '3.4')
         installer << '--disable-system-checks '
       end
       installer

data/definitions/scenarios/upgrade_to_capsule_6_12.rb

@@ -56,6 +56,8 @@ module Scenarios::Capsule_6_12
 
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.12'))
+      modules_to_enable = ["satellite-capsule:#{el_short_name}"]
+      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)

data/definitions/scenarios/upgrade_to_capsule_6_12_z.rb

@@ -56,6 +56,8 @@ module Scenarios::Capsule_6_12_z
 
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.12'))
+      modules_to_enable = ["satellite-capsule:#{el_short_name}"]
+      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)

data/definitions/scenarios/upgrade_to_satellite_6_12.rb

@@ -57,6 +57,8 @@ module Scenarios::Satellite_6_12
 
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.12'))
+      modules_to_enable = ["satellite:#{el_short_name}"]
+      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)

data/definitions/scenarios/upgrade_to_satellite_6_12_z.rb

@@ -56,6 +56,8 @@ module Scenarios::Satellite_6_12_z
 
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.12'))
+      modules_to_enable = ["satellite:#{el_short_name}"]
+      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -223,6 +223,7 @@ files:
 - definitions/features/pulpcore_database.rb
 - definitions/features/puppet_server.rb
 - definitions/features/redis.rb
+- definitions/features/salt_server.rb
 - definitions/features/satellite.rb
 - definitions/features/service.rb
 - definitions/features/sync_plans.rb
@@ -490,7 +491,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt