foreman_maintain 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4151b9d6dbc810f7f85aa093bdcfc4f967530dbeddcf7e13e88ce998125211dc
-  data.tar.gz: e7db5a3881d9652bae19c61f95ff95076745f36212c6e36f4cf582d4b5f33c8f
+  metadata.gz: 4b787c9490d94fe3a96d7b36f8faea35a8d086ae7ccee0aa23200a60fa344daa
+  data.tar.gz: 5102cd1826bb415b9a3a32f1bf5055ca8c13ed7c6ccdb9a7f9ab0357ca5f2d09
 SHA512:
-  metadata.gz: 56165e03d708aa74d5b370cd7f2ca96a0121b2b97d14f326372181ef2c464eb9856dbafd1f60ad99aea89c9a610a1579a334a4a69c12abee38b70d2eb84a899a
-  data.tar.gz: e43c42dbbe5aab6752e16429dae6fd70367510be2df57f026aa5ad53bb1efb9ef9e4eb2efc4331aef3823b93729412b789bc8c3e8396e03b4563bc82cf42199b
+  metadata.gz: 674907284187a7b64cbb16bd11d5718cf32dd94663eebeb1193b7c82a350359328ab59e8b1c593abed51e2d2891e16db073c3f2f87c352e25264b07600804c78
+  data.tar.gz: a5789c3df8d36291c0b7793eac25911921873bfb7e02ad50bc9212f4ae668059c70459d5cbc05728b5dfd5dbbee714ffc1f0b5fd942c5b62943b0c5f88efcabe

data/definitions/features/foreman_cockpit.rb

@@ -0,0 +1,15 @@
+class Features::ForemanCockpit < ForemanMaintain::Feature
+  metadata do
+    label :foreman_cockpit
+
+    confine do
+      server? && find_package('tfm-rubygem-foreman_remote_execution-cockpit')
+    end
+  end
+
+  def services
+    [
+      system_service('foreman-cockpit')
+    ]
+  end
+end

data/definitions/procedures/backup/online/safety_confirmation.rb

@@ -4,21 +4,25 @@ module Procedures::Backup
       metadata do
         description 'Data consistency warning'
         tags :backup
+        param :include_db_dumps
       end
 
       def run
-        answer = ask_decision(
-          "*** WARNING: The online backup is intended for making a copy of the data\n" \
+        answer = ask_decision(warning_message(@include_db_dumps), 'y(yes), q(quit)')
+        abort! unless answer == :yes
+      end
+
+      def warning_message(include_db_dumps)
+        substr = include_db_dumps ? 'database dump' : 'online backup'
+        "*** WARNING: The #{substr} is intended for making a copy of the data\n" \
           '*** for debugging purposes only.' \
           " The backup routine can not ensure 100% consistency while the\n" \
           "*** backup is taking place as there is a chance there may be data mismatch between\n" \
           '*** Mongo and Postgres databases while the services are live.' \
-          " If you wish to utilize the online backup\n" \
+          " If you wish to utilize the #{substr}\n" \
           '*** for production use you need to ensure that there are' \
           " no modifications occurring during\n" \
-          "*** your backup run.\n\nDo you want to proceed?", actions_msg: 'y(yes), q(quit)'
-        )
-        abort! unless answer == :yes
+          "*** your backup run.\n\nDo you want to proceed?"
       end
     end
   end

data/definitions/procedures/content/prepare.rb

@@ -6,7 +6,8 @@ module Procedures::Content
     end
 
     def run
-      puts execute!('foreman-rake katello:pulp3_migration')
+      # use interactive to get realtime output
+      puts execute!('foreman-rake katello:pulp3_migration', :interactive => true)
     end
   end
 end

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -8,6 +8,7 @@ module ForemanMaintain::PackageManager
     private
 
     def dnf_action(action, packages, with_status: false, assumeyes: false)
+      packages = [packages].flatten(1)
       yum_options = []
       yum_options << '-y' if assumeyes
       if with_status

data/lib/foreman_maintain/utils/backup.rb

@@ -163,7 +163,7 @@ module ForemanMaintain
       def validate_hostname?
         # make sure that the system hostname is the same as the backup
         config_tarball = file_map[:config_files][:path]
-        tar_cmd = "tar zxf #{config_tarball} etc/httpd/conf/httpd.conf --to-stdout"
+        tar_cmd = "tar zxf #{config_tarball} etc/httpd/conf/httpd.conf --to-stdout --occurrence=1"
         status, httpd_config = execute_with_status(tar_cmd)
 
         # Incremental backups sometimes don't include httpd.conf. Since a "base" backup

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -170,6 +170,7 @@ files:
 - definitions/features/dynflow_sidekiq.rb
 - definitions/features/foreman_1_11_x.rb
 - definitions/features/foreman_1_7_x.rb
+- definitions/features/foreman_cockpit.rb
 - definitions/features/foreman_database.rb
 - definitions/features/foreman_openscap.rb
 - definitions/features/foreman_proxy.rb