mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-16 07:58:04 +00:00
Allow migrating the Puppet CA
With hat: puppet
This commit is contained in:
parent
75b43c8606
commit
320ab3fb48
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=557019
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
PORTNAME= puppetserver-ca
|
PORTNAME= puppetserver-ca
|
||||||
PORTVERSION= 2.0.0
|
PORTVERSION= 2.0.0
|
||||||
|
PORTREVISION= 1
|
||||||
CATEGORIES= sysutils rubygems
|
CATEGORIES= sysutils rubygems
|
||||||
MASTER_SITES= RG
|
MASTER_SITES= RG
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
base_defaults = [
|
base_defaults = [
|
||||||
[:confdir, user_specific_puppet_confdir],
|
[:confdir, user_specific_puppet_confdir],
|
||||||
- [:ssldir,'$confdir/ssl'],
|
- [:ssldir,'$confdir/ssl'],
|
||||||
+ [:ssldir,'/var/puppet/ssl'],
|
+ [:ssldir, '/var/puppet/ssl'],
|
||||||
[:certdir, '$ssldir/certs'],
|
[:certdir, '$ssldir/certs'],
|
||||||
[:certname, default_certname],
|
[:certname, default_certname],
|
||||||
[:server, 'puppet'],
|
[:server, 'puppet'],
|
||||||
|
@ -0,0 +1,27 @@
|
|||||||
|
--- 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)
|
Loading…
Reference in New Issue
Block a user