puppetserver-ca 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2425e37368e436ac075108565392b12b76bfc4979211314f9546b28d91c4436c
-  data.tar.gz: c4be371798d5a7baed4d9eeac5c96d2dad2ec822f94f243500b1e647248a4c89
+  metadata.gz: ca072b9b538db717c0a026483b7e737633a3f95199ddd027eaf2ab54f7154914
+  data.tar.gz: 683da993f6f520a1b410699ccfb12a07b6fb294c66f5ea3842dd926de3302d3d
 SHA512:
-  metadata.gz: fb89a14f1cf7f137cf970854ab1f7604c3d60e8bb6c3d2b45035a2567a1606f490e1f8ab5386d84b270121abe1278de4777aeddeda039f4597125e3297933d14
-  data.tar.gz: 0f66e2871e19442d382b23c035546affe368990df2ba051672b55c549cf01fe267f930b4aae4ec465f2e4e0b82ee73ccc30708df04c680a0d2c1b2dac8f7cf4d
+  metadata.gz: 28967be755677708b09d944ff1998d75f42ca83fcd095a1339fdb4f33f48f55100a17c2dfc978ea0ec89c8ab31ece4e84c5be683cf4c06f16d0e344d9e9534fb
+  data.tar.gz: c83637fb867960f1bff097bbab00b826cbaf57f605fe42ef0aa79d0f8abeb56327ba538c409e734e181c8ba38ebf12e5b82054b5f2e1ef1b38427fd1e760372c

data/lib/puppetserver/ca/config/puppet.rb

@@ -105,7 +105,6 @@ module Puppetserver
           base_defaults = [
             [:confdir, user_specific_conf_dir],
             [:ssldir,'$confdir/ssl'],
-            [:cadir, '$ssldir/ca'],
             [:certdir, '$ssldir/certs'],
             [:certname, default_certname],
             [:server, 'puppet'],
@@ -150,6 +149,10 @@ module Puppetserver
             settings[setting_name] = substitutions[substitution_name] = subbed_value
           end
 
+          cadir = find_cadir(overrides.fetch(:cadir, false),
+                             settings[:confdir])
+          settings[:cadir] = substitutions['$cadir'] = cadir
+
           dependent_defaults.each do |setting_name, default_value|
             setting_value = overrides.fetch(setting_name, default_value)
             settings[setting_name] = setting_value
@@ -212,6 +215,21 @@ module Puppetserver
 
        private
 
+        def find_cadir(configured_cadir, confdir)
+          if configured_cadir
+            configured_cadir
+          else
+            old_cadir = Puppetserver::Ca::Utils::Config.old_default_cadir(confdir)
+            new_cadir = Puppetserver::Ca::Utils::Config.new_default_cadir(confdir)
+
+            if File.exist?("#{new_cadir}/ca_crt.pem")
+              new_cadir
+            else
+              old_cadir
+            end
+          end
+        end
+
         def explicitly_given_config_file_or_default_config_exists?
           !@using_default_location || File.exist?(@config_path)
         end

data/lib/puppetserver/ca/utils/config.rb

@@ -19,6 +19,25 @@ module Puppetserver
           end.sort.uniq.join(", ")
         end
 
+        def self.puppet_confdir
+          if running_as_root?
+            '/etc/puppetlabs/puppet'
+          else
+            "#{ENV['HOME']}/.puppetlabs/etc/puppet"
+          end
+        end
+
+        def self.puppetserver_confdir(puppet_confdir)
+          File.join(File.dirname(puppet_confdir), 'puppetserver')
+        end
+
+        def self.old_default_cadir(confdir = puppet_confdir)
+          File.join(confdir, 'ssl', 'ca')
+        end
+
+        def self.new_default_cadir(confdir = puppet_confdir)
+          File.join(puppetserver_confdir(confdir), 'ca')
+        end
       end
     end
   end

data/lib/puppetserver/ca/version.rb

@@ -1,5 +1,5 @@
 module Puppetserver
   module Ca
-    VERSION = "1.9.3"
+    VERSION = "1.9.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetserver-ca
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter