foreman_maintain 1.1.5 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d5168b856e2af86bdafed767d362dae19556dcc0b72d6e5e600f097b195de2ed
4
- data.tar.gz: 4399bf04c5108dd0e63cdd917c27238d10952fc962a44ffcf6cf18b628d439f5
3
+ metadata.gz: 92257cd7abfa6ce1234f0d5223197de9c804a8f1aea3f6f9ceb1afc4fcaacb52
4
+ data.tar.gz: 6dd2767bd384cc19871242c8bf68499b9c6d3b641584ab18685e6c0f3c6bcfed
5
5
  SHA512:
6
- metadata.gz: a0b7212318f4d888fdca2d01685466dace2b65a1a9d0147f733ccc12e2f41d9a83244f13195836ba465a5280819d687de41b3d89092d94bb22af8b8cedc9df20
7
- data.tar.gz: 4b03699dad54a36fff8b765e1d3cbc673da5dae0e012de3fccd42623f9bba4dd2110cceae92c0826b0e7b72933705764e1507f3f5869e13801588f8fc9b28bb9
6
+ metadata.gz: b60d2b4b6b9c19fbcc75a31aaef0fe79d155477215a88fa4a4b6ece8d92e4c69901ed50766db333934ce7ce84e120a45aa51eb1e5799b25e615881ad26ad190a
7
+ data.tar.gz: b0790929f26f2cdf667551ec1ded6aaf312c49c804a6defaacbe23524ac23c1f213d440d090e369168593141582231b05c4c2b5f426379ce5e6c842ec2a31c88
@@ -75,7 +75,7 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
75
75
  # rubocop:enable Metrics/MethodLength
76
76
 
77
77
  def extend_with_db_options
78
- db_options = { '-d' => construct_database_string }
78
+ db_options = { '-d' => configuration['database'] }
79
79
  if check_option_using_cpdb_help('dbhost')
80
80
  db_options['--dbhost'] = configuration['host']
81
81
  db_options['--dbport'] = configuration['port']
@@ -83,15 +83,6 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
83
83
  db_options
84
84
  end
85
85
 
86
- def construct_database_string
87
- db_str = configuration['database']
88
- extra_opts = []
89
- extra_opts << "ssl=#{configuration['ssl']}" if configuration['ssl']
90
- extra_opts << "sslfactory=#{configuration['sslfactory']}" if configuration['sslfactory']
91
- db_str += "?#{extra_opts.join('&')}" unless extra_opts.empty?
92
- db_str
93
- end
94
-
95
86
  def fetch_extra_param(url, key_name)
96
87
  query_string = url.split('?')[1]
97
88
  return nil unless query_string
@@ -17,8 +17,28 @@ boost-random
17
17
  boost-iostreams
18
18
  boost-thread
19
19
  yum-utils
20
+ # el7 psql client dependencies
21
+ rh-postgresql12-postgresql
22
+ rh-postgresql12-postgresql-libs
23
+ rh-postgresql12-runtime
20
24
  # el8 yum-utils dependencies
21
25
  dnf-plugins-core
22
26
  python3-dnf-plugins-core
27
+ # el8 nftables dependencies
28
+ nftables
29
+ firewalld
30
+ firewalld-filesystem
31
+ ipset
32
+ ipset-libs
33
+ iptables
34
+ iptables-etables
35
+ iptables-libs
36
+ libnetfilter_conntrack
37
+ libnffnetlink
38
+ libnftnl
39
+ python3-firewall
40
+ python3-nftables
41
+ python3-slip
42
+ python3-slip-dbus
23
43
  # foreman-maintain
24
44
  rubygem-foreman_maintain
@@ -1,3 +1,3 @@
1
1
  module ForemanMaintain
2
- VERSION = '1.1.5'.freeze
2
+ VERSION = '1.1.6'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_maintain
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.5
4
+ version: 1.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-09-14 00:00:00.000000000 Z
11
+ date: 2022-09-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: clamp