foreman_maintain 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8dea59abb9dd938c046267a9561ec9e6b67b1982b63ceb098842726b50dba2f
-  data.tar.gz: 44bb1053c3b8a810d4ec27c531d182fc83118635bf5e1d9f16ab6e6b55bd46a2
+  metadata.gz: f4f3a8ccaafca99807806029569f3f36ae2510fad72f8c4e38cc5151dc90b0f5
+  data.tar.gz: 37af7fa939b29079d404a1d6461f4425e53b35574a9a76829b7effcadf698443
 SHA512:
-  metadata.gz: a18584dc4a419be407d39587193735f66e8497ba6dbcb3670e786eca21abb0860da885267005ba351ab01aa5c3e5eee79b6ec9bc2d0763ed997779d7a011e492
-  data.tar.gz: '08e82fd2c29f07da6be8d9d302714d5aeaf9b7f208924f9a211aa133ab8bb7b9c769eec7495e94f5008a3d6dfd806dabccaffa1c8b98f6f3ec93ff75bdf1b661'
+  metadata.gz: 198249fe85fdddfe42c8c6b5ba737653f4fd0beeda3283c5e2cacebaf4b4f4207de80d0228fb829326ff906ebcc8b3d147a60ff77f4000e07251078fdd533ad7
+  data.tar.gz: 825a02508773fe67342e78e34dac185338eee5ccd24ace18df3d56255705b1e2cc76f986d827a0712d7112821c2027cfe6dc4402a30f08d6093a99fb4bc8d47d

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/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.2.4'.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.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-01 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
@@ -496,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