pe_rbac 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 003e9ccdbe211c50b4025335831bcaab7c77d4cf
-  data.tar.gz: 40d72b46ffd84a8b9976d81eba7bf93f23e92e65
+  metadata.gz: 0f77d4b61e7a7c630244c5ffc50313bf9239100f
+  data.tar.gz: 45c6bbb55280efbd810320257712c662150383a1
 SHA512:
-  metadata.gz: 5c05146edfa1e4d4eb2392f774699c834388d836d546b34d1aebef2e638f2375b6e3799e317013de34d9dd511b372c95b5730bc12061ba225bee42c26712ed1c
-  data.tar.gz: fec01c7aae9f104627bc7bd02ba77fa87544a2d53b6d44306adb96010d1060046d40071d96cdf3a7fe927e0d6c431daa3ed07e621b469fac48a7e5fbf0bf162f
+  metadata.gz: 9aa9257686040018bb92e43a657a5c9c49e6cd10b7991cd84af4a6bd01f3b40ebbfc1c40b9f199c1763f4a341373f19adcedf8116fb5331f723ce0347f799491
+  data.tar.gz: d9260d27ccbe0925670f9359a8d74c30c9a307eabe156c39b57b831226fce6b958123454b91e642a0bd0207eec62eea2e73049234247cbc24b71279411769003

data/README.md

@@ -6,6 +6,11 @@ TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
+Gem dependencies need G++ amongst other things.  Easiest way to proceed:
+```
+yum groupinstall 'Development Tools'
+```
+
 Add this line to your application's Gemfile:
 
 ```ruby

data/exe/pe_rbac

@@ -3,7 +3,7 @@ require 'pe_rbac'
 require 'escort'
 
 Escort::App.create do |app|
-  app.version "0.0.1"
+  app.version PeRbac::VERSION
   app.summary "pe_rbac"
   app.description "create RBAC users and install tokens"
 

data/lib/pe_rbac/version.rb

@@ -1,3 +1,3 @@
 module PeRbac
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/pe_rbac.rb

@@ -5,11 +5,28 @@ require 'json'
 
 module PeRbac
   ssldir = '/etc/puppetlabs/puppet/ssl'
+  fqdn = %x(facter fqdn).strip
+  pe_old_pk   = "#{ssldir}/private_keys/pe-internal-orchestrator.pem"
+  pe_old_cert = "#{ssldir}/certs/pe-internal-orchestrator.pem"
+  pe_new_pk   = "#{ssldir}/private_keys/#{fqdn}.pem"
+  pe_new_cert = "#{ssldir}/certs/#{fqdn}.pem"
+
+  # pe 2016.4.0 removes the pe-internal-orchestrator.pem file but old systems
+  # will still have the client cert (which won't work), so pick based on 
+  # using pe-internal-orchestrator.pem if its available
+  if File.exist?(pe_old_pk)
+    pk    = pe_old_pk
+    cert  = pe_old_cert
+  else
+    pk    = pe_new_pk
+    cert  = pe_new_cert
+  end
+
   CONF = {
     host: Socket.gethostname,
     port: 4433,
-    cert: ssldir + '/certs/pe-internal-orchestrator.pem',
-    key: ssldir + '/private_keys/pe-internal-orchestrator.pem',
+    cert: cert,
+    key: pk,
     cacert: ssldir + '/certs/ca.pem'
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pe_rbac
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler