diff options
| author | Romain Tartière <romain@FreeBSD.org> | 2020-12-04 20:46:31 +0000 |
|---|---|---|
| committer | Romain Tartière <romain@FreeBSD.org> | 2020-12-04 20:46:31 +0000 |
| commit | 320ab3fb482ea10ef0bb8603352ad0f38f929832 (patch) | |
| tree | aafe96df6fcbca051b7fc0619a43dc695a50a726 | |
| parent | Hello PuppetServer 7! (diff) | |
Allow migrating the Puppet CA
With hat: puppet
Notes
Notes:
svn path=/head/; revision=557019
3 files changed, 29 insertions, 1 deletions
diff --git a/sysutils/rubygem-puppetserver-ca/Makefile b/sysutils/rubygem-puppetserver-ca/Makefile index a8ecc921f227..4c1901381a30 100644 --- a/sysutils/rubygem-puppetserver-ca/Makefile +++ b/sysutils/rubygem-puppetserver-ca/Makefile @@ -2,6 +2,7 @@ PORTNAME= puppetserver-ca PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb b/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb index 3a2b5882f522..50a34086c23e 100644 --- a/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb +++ b/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb @@ -5,7 +5,7 @@ base_defaults = [ [:confdir, user_specific_puppet_confdir], - [:ssldir,'$confdir/ssl'], -+ [:ssldir,'/var/puppet/ssl'], ++ [:ssldir, '/var/puppet/ssl'], [:certdir, '$ssldir/certs'], [:certname, default_certname], [:server, 'puppet'], diff --git a/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb b/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb new file mode 100644 index 000000000000..ead5c3d960d1 --- /dev/null +++ b/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb @@ -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) |