foreman_envsync 1.2.3 → 1.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2d987ff8f7bfd3d2845ea51195f513ab357ae8fef2382d2bb15cc764293c9ef9
4
- data.tar.gz: 55cf9f7a96aed4cdbe4fe0271d0fb45b227d660f4291762f640cf9db7203673a
3
+ metadata.gz: 4cb65d7e80faa3dc6b65430e9236a1318cd4a1c79153d871d190eae77cd55d91
4
+ data.tar.gz: 5fefaad9cc7a341b8d5fd363aca513f3587674dbc5464bf514645facd8fe93d8
5
5
  SHA512:
6
- metadata.gz: 9ec0f2236b24b425f33ff68419f3d2732efafc65e36723936e03691c8caf655cfd820028c18e5f2dd206fea4976ab5c3d5931ba270672652b95c98253ef2def4
7
- data.tar.gz: 1bc572c08b399cbc6e816c8701d8bd778e6e590c5d51982b92e35be96d0614b879c292a0ff87bdf900f47a14c98fde8bf0aeee3fa286860ebe4a76e69e369993
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.3"
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.3
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joshua Hoblitt
8
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