| Server IP : 82.208.35.60 / Your IP : 216.73.216.168 Web Server : Apache/2.4.55 (FreeBSD) OpenSSL/1.1.1q-freebsd PHP/7.3.31 System : FreeBSD server7.d2m.cz 12.4-RELEASE-p9 FreeBSD 12.4-RELEASE-p9 GENERIC amd64 User : studiokobylisy_cz ( 1008) PHP Version : 7.3.31 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : OFF | Perl : OFF | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /usr/ports/sysutils/rubygem-puppetserver-ca/files/ |
Upload File : |
--- lib/puppetserver/ca/utils/config.rb.orig 2020-11-28 01:14:43 UTC
+++ lib/puppetserver/ca/utils/config.rb
@@ -23,7 +23,7 @@ module Puppetserver
def self.puppet_confdir
if running_as_root?
- '/etc/puppetlabs/puppet'
+ '/usr/local/etc/puppet'
else
"#{ENV['HOME']}/.puppetlabs/etc/puppet"
end
@@ -34,11 +34,13 @@ module Puppetserver
end
def self.default_ssldir(confdir = puppet_confdir)
- File.join(confdir, 'ssl')
+ res = File.join(confdir, 'ssl')
+ res = '/var/puppet/ssl' unless File.directory?(res)
+ res
end
def self.old_default_cadir(confdir = puppet_confdir)
- File.join(confdir, 'ssl', 'ca')
+ '/var/puppet/ssl/ca'
end
def self.new_default_cadir(confdir = puppet_confdir)