foreman_maintain 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdc12ecbef4e02dd8b77b3c4888623c13e418b7435a53f8dc1d280b9faf0b699
-  data.tar.gz: 4d75194cf9184f68be21cbc55cba1def43d76eff4cfc1bc92a091b93662c3371
+  metadata.gz: f4f3a8ccaafca99807806029569f3f36ae2510fad72f8c4e38cc5151dc90b0f5
+  data.tar.gz: 37af7fa939b29079d404a1d6461f4425e53b35574a9a76829b7effcadf698443
 SHA512:
-  metadata.gz: 26f3e34a2670e7b92ddeb1db1107446fb71ded2d1cbe5b79afa259a3a13a5d87e8d45a63f7ba235fa485099689c30eee366bd7bace95d52db7f28cb0dcad5d35
-  data.tar.gz: 217124b53d7294d7d4be7c6be9a1a7e6fb43e58190c30abdcbcb9e48daf0e0e3164ca9e5b617e3c08add2a83d722dac7f5dd91f8163b400008ac748f8e32d56d
+  metadata.gz: 198249fe85fdddfe42c8c6b5ba737653f4fd0beeda3283c5e2cacebaf4b4f4207de80d0228fb829326ff906ebcc8b3d147a60ff77f4000e07251078fdd533ad7
+  data.tar.gz: 825a02508773fe67342e78e34dac185338eee5ccd24ace18df3d56255705b1e2cc76f986d827a0712d7112821c2027cfe6dc4402a30f08d6093a99fb4bc8d47d

data/definitions/checks/foreman_proxy/check_tftp_storage.rb

@@ -42,12 +42,8 @@ module Checks::ForemanProxy
     end
 
     def lookup_token_duration
-      data = feature(:foreman_database). \
-             query("select s.value, s.default from settings s \
-                    where category IN ('Setting::Provisioning','Setting') \
-                    and name = 'token_duration'")
-
-      YAML.load(data[0]['value'] || data[0]['default'])
+      data = feature(:hammer).run('--output yaml settings info --id token_duration')
+      YAML.load(data)['Value']
     end
   end
 end

data/definitions/features/foreman_proxy.rb

@@ -144,7 +144,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
 
     cmd = "curl -w '\n%{http_code}' -s "
     cmd += format_shell_args('--cert' => ssl_cert, '--key' => ssl_key, '--cacert' => ssl_ca)
-    cmd += " https://$(hostname):#{proxy_settings[:https_port]}"
+    cmd += " https://#{hostname}:#{proxy_settings[:https_port]}"
     cmd
   end
 

data/definitions/features/foreman_tasks.rb

@@ -17,6 +17,7 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     Actions::Candlepin::ListenOnCandlepinEvents
     Actions::Katello::EventQueue::Monitor
     Actions::Insights::EmailPoller
+    ForemanInventoryUpload::Async::GenerateAllReportsJob
     ForemanInventoryUpload::Async::GenerateReportJob
     ForemanInventoryUpload::Async::QueueForUploadJob
     ForemanInventoryUpload::Async::UploadReportJob
@@ -24,6 +25,7 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     InsightsCloud::Async::InsightsFullSync
     InsightsCloud::Async::InsightsResolutionsSync
     InsightsCloud::Async::InsightsRulesSync
+    InsightsCloud::Async::InsightsScheduledSync
     InventorySync::Async::InventoryFullSync
     InventorySync::Async::InventoryHostsSync
     InventorySync::Async::InventoryScheduledSync

data/definitions/features/mosquitto.rb

@@ -0,0 +1,28 @@
+class Features::Mosquitto < ForemanMaintain::Feature
+  metadata do
+    label :mosquitto
+
+    confine do
+      # Luckily, the service name is the same as the package providing it
+      find_package(service_name)
+    end
+  end
+
+  def services
+    [system_service(self.class.service_name, 10)]
+  end
+
+  def config_files
+    [self.class.etc_prefix]
+  end
+
+  class << self
+    def etc_prefix
+      '/etc/mosquitto'
+    end
+
+    def service_name
+      'mosquitto'
+    end
+  end
+end

data/definitions/features/sync_plans.rb

@@ -33,12 +33,22 @@ class Features::SyncPlans < ForemanMaintain::Feature
     feature(:foreman_database).query(query).map { |r| r['id'].to_i }
   end
 
+  def validate_sync_plan_ids(ids)
+    ids_condition = ids.map { |id| "'#{id}'" }.join(',')
+    query = <<-SQL
+      SELECT id FROM katello_sync_plans WHERE id IN (#{ids_condition})
+    SQL
+    feature(:foreman_database).query(query).map { |r| r['id'].to_i }
+  end
+
   def make_disable(ids)
     update_records(ids, false)
   end
 
   def make_enable
-    update_records(data[:disabled], true)
+    # remove ids of sync plans which no longer exist in DB
+    @data[:disabled] = validate_sync_plan_ids(@data[:disabled])
+    update_records(@data[:disabled], true)
   end
 
   def load_from_storage(storage)

data/definitions/features/tar.rb

@@ -51,13 +51,11 @@ class Features::Tar < ForemanMaintain::Feature
     end
 
     if volume_size
-      split_tar_script = default_split_tar_script
       tar_command << "--tape-length=#{volume_size}"
-      tar_command << "--new-volume-script=#{split_tar_script}"
     end
 
     tar_command << '--overwrite' if options[:overwrite]
-    tar_command << '--gzip' if options[:gzip]
+    tar_command << (options[:gzip] ? '--gzip' : "--new-volume-script=#{default_split_tar_script}")
 
     exclude = options.fetch(:exclude, [])
     exclude.each do |ex|

data/definitions/procedures/restore/reindex_databases.rb

@@ -0,0 +1,22 @@
+module Procedures::Restore
+  class ReindexDatabases < ForemanMaintain::Procedure
+    include ForemanMaintain::Concerns::SystemService
+
+    metadata do
+      description 'REINDEX databases'
+
+      confine do
+        feature(:instance).postgresql_local?
+      end
+    end
+
+    def run
+      with_spinner('Reindexing the databases') do |spinner|
+        feature(:service).handle_services(spinner, 'start', :only => ['postgresql'])
+
+        spinner.update('Reindexing the databases')
+        execute!('runuser - postgres -c "reindexdb -a"')
+      end
+    end
+  end
+end

data/definitions/scenarios/restore.rb

@@ -45,6 +45,11 @@ module ForemanMaintain::Scenarios
         add_step(Procedures::Service::Stop.new(:only => ['postgresql']))
       end
       restore_mongo_dump(backup)
+
+      if feature(:instance).postgresql_local? && !backup.online_backup?
+        add_step_with_context(Procedures::Restore::ReindexDatabases)
+      end
+
       add_steps_with_context(Procedures::Pulp::Migrate,
                              Procedures::Pulpcore::Migrate,
                              Procedures::Restore::CandlepinResetMigrations)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.2.3'.freeze
+  VERSION = '1.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -217,6 +217,7 @@ files:
 - definitions/features/katello.rb
 - definitions/features/katello_install.rb
 - definitions/features/mongo.rb
+- definitions/features/mosquitto.rb
 - definitions/features/nftables.rb
 - definitions/features/pulp2.rb
 - definitions/features/pulpcore.rb
@@ -324,6 +325,7 @@ files:
 - definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
 - definitions/procedures/restore/regenerate_queues.rb
+- definitions/procedures/restore/reindex_databases.rb
 - definitions/procedures/selinux/set_file_security.rb
 - definitions/procedures/service/base.rb
 - definitions/procedures/service/daemon_reload.rb
@@ -495,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt