foreman_envsync 1.2.1 → 1.3.0

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: 5259d69b1359b05806b55d92c30908c41787c099e0fbfd62f857693c9eaff180
4
- data.tar.gz: 577f223ae5bc14b2baf7f5e48c0c9dba41f290ee6ad2ebc2c8baf7b590118c0e
3
+ metadata.gz: 4cb65d7e80faa3dc6b65430e9236a1318cd4a1c79153d871d190eae77cd55d91
4
+ data.tar.gz: 5fefaad9cc7a341b8d5fd363aca513f3587674dbc5464bf514645facd8fe93d8
5
5
  SHA512:
6
- metadata.gz: 87c6a9a9e0c826cc0a35b3347ce0a8afd1cb85886c991f1927f1ed0ff576eae01540b1ad445e5671c5b032d42eff7776efc6a51d786681e9c8a5e7a5e8b57582
7
- data.tar.gz: ec88382a2aebd774e3a88c16e860bda7d2396626e131657883c2844f775045ebc76012eba12e93aa48273e8be9892eaf92d4487acb042d4d963612358d764c93
6
+ metadata.gz: 61726939b14ca92469901feb59c77307be75185a0e079a419ad6c61dc7f3467c8a69dc48d05d3fa094707accf34e5f5a7a32c547d2a26305e2fca91bcf05f40f
7
+ data.tar.gz: 739e264dc25e67d34b31f61ec583de68a5b1fad1f9270a02abb4f45566126df1ff6e39e3a650a297dc29660cc3cb22612b261e6fb03c1d83c8906494d22c7f59
data/exe/foreman_envsync CHANGED
@@ -103,6 +103,14 @@ def foreman_org_ids
103
103
  hammer_cmd_parse_one(cmd, field)
104
104
  end
105
105
 
106
+ # prefer the puppetserver 7 ca_crt.pem path
107
+ def ssl_ca_file
108
+ %w[
109
+ /etc/puppetlabs/puppetserver/ca/ca_crt.pem
110
+ /etc/puppetlabs/puppet/ssl/ca/ca_crt.pem
111
+ ].find { |f| File.exist?(f) }
112
+ end
113
+
106
114
  def puppetserver_env_list
107
115
  hostname = Socket.gethostname
108
116
 
@@ -112,7 +120,7 @@ def puppetserver_env_list
112
120
  ssl_client_cert: cert_file("/etc/puppetlabs/puppet/ssl/certs/#{hostname}.pem"),
113
121
  ssl_client_key: key_file("/etc/puppetlabs/puppet/ssl/private_keys/#{hostname}.pem"),
114
122
  verify_ssl: true,
115
- ssl_ca_file: "/etc/puppetlabs/puppet/ssl/ca/ca_crt.pem"
123
+ ssl_ca_file: ssl_ca_file
116
124
  )
117
125
 
118
126
  JSON.parse(res)["environments"].keys
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ForemanEnvsync
4
- VERSION = "1.2.1"
4
+ VERSION = "1.3.0"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_envsync
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joshua Hoblitt
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-08-04 00:00:00.000000000 Z
11
+ date: 2022-08-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: hammer_cli
@@ -94,7 +94,7 @@ dependencies:
94
94
  - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
- description:
97
+ description:
98
98
  email:
99
99
  - josh@hoblitt.com
100
100
  executables:
@@ -126,7 +126,7 @@ metadata:
126
126
  source_code_uri: https://github.com/lsst-it/foreman_envsync
127
127
  changelog_uri: https://github.com/lsst-it/foreman_envsync/blob/master/CHANGELOG.md
128
128
  rubygems_mfa_required: 'false'
129
- post_install_message:
129
+ post_install_message:
130
130
  rdoc_options: []
131
131
  require_paths:
132
132
  - lib
@@ -141,8 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
141
141
  - !ruby/object:Gem::Version
142
142
  version: '0'
143
143
  requirements: []
144
- rubygems_version: 3.1.6
145
- signing_key:
144
+ rubygems_version: 3.3.7
145
+ signing_key:
146
146
  specification_version: 4
147
147
  summary: Sync pupperserver envs with foreman
148
148
  test_files: []