Date: Fri, 4 Dec 2020 20:46:31 +0000 (UTC) From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557019 - in head/sysutils/rubygem-puppetserver-ca: . files Message-ID: <202012042046.0B4KkVQK050480@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: romain Date: Fri Dec 4 20:46:31 2020 New Revision: 557019 URL: https://svnweb.freebsd.org/changeset/ports/557019 Log: Allow migrating the Puppet CA With hat: puppet Added: head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb (contents, props changed) Modified: head/sysutils/rubygem-puppetserver-ca/Makefile head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb Modified: head/sysutils/rubygem-puppetserver-ca/Makefile ============================================================================== --- head/sysutils/rubygem-puppetserver-ca/Makefile Fri Dec 4 20:45:20 2020 (r557018) +++ head/sysutils/rubygem-puppetserver-ca/Makefile Fri Dec 4 20:46:31 2020 (r557019) @@ -2,6 +2,7 @@ PORTNAME= puppetserver-ca PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG Modified: head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb ============================================================================== --- head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb Fri Dec 4 20:45:20 2020 (r557018) +++ head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb Fri Dec 4 20:46:31 2020 (r557019) @@ -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'], Added: head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb Fri Dec 4 20:46:31 2020 (r557019) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012042046.0B4KkVQK050480>