Index: head/sysutils/rubygem-puppetserver-ca/Makefile =================================================================== --- head/sysutils/rubygem-puppetserver-ca/Makefile (revision 557018) +++ head/sysutils/rubygem-puppetserver-ca/Makefile (revision 557019) @@ -1,19 +1,20 @@ # $FreeBSD$ PORTNAME= puppetserver-ca PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG MAINTAINER= puppet@FreeBSD.org COMMENT= Ruby CLI tool to interact with the Puppet Server Certificate Authority LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= gem USE_RUBY= yes PLIST_FILES= bin/puppetserver-ca .include Index: 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 (revision 557018) +++ head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb (revision 557019) @@ -1,11 +1,11 @@ --- lib/puppetserver/ca/config/puppet.rb.orig 2020-11-06 21:46:06 UTC +++ lib/puppetserver/ca/config/puppet.rb @@ -97,7 +97,7 @@ module Puppetserver # defaults below 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'], Index: head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb =================================================================== --- head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb (nonexistent) +++ head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb (revision 557019) @@ -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) Property changes on: head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_utils_config.rb ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property