Index: head/sysutils/rubygem-puppetserver-ca/Makefile =================================================================== --- head/sysutils/rubygem-puppetserver-ca/Makefile (revision 480849) +++ head/sysutils/rubygem-puppetserver-ca/Makefile (revision 480850) @@ -1,23 +1,23 @@ # $FreeBSD$ PORTNAME= puppetserver-ca -PORTVERSION= 1.0.0 +PORTVERSION= 1.1.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 RUN_DEPENDS= facter:sysutils/facter USES= gem USE_RUBY= yes post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/lib/puppetserver/ca/config/puppet.rb .include Index: head/sysutils/rubygem-puppetserver-ca/distinfo =================================================================== --- head/sysutils/rubygem-puppetserver-ca/distinfo (revision 480849) +++ head/sysutils/rubygem-puppetserver-ca/distinfo (revision 480850) @@ -1,3 +1,3 @@ -TIMESTAMP = 1537529577 -SHA256 (rubygem/puppetserver-ca-1.0.0.gem) = f438c2dc2a7f3c30cc7964fa335357c4937feff529a3bdf973b49f3e820e1168 -SIZE (rubygem/puppetserver-ca-1.0.0.gem) = 31232 +TIMESTAMP = 1538130641 +SHA256 (rubygem/puppetserver-ca-1.1.1.gem) = f9a584f0647c87e2dc6055066dd5e819827514a61baa557ef1d9c730afe5ad68 +SIZE (rubygem/puppetserver-ca-1.1.1.gem) = 32768 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 480849) +++ head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb (revision 480850) @@ -1,20 +1,20 @@ ---- lib/puppetserver/ca/config/puppet.rb.orig 2018-09-27 06:33:57 UTC +--- lib/puppetserver/ca/config/puppet.rb.orig 2018-09-28 10:36:20 UTC +++ lib/puppetserver/ca/config/puppet.rb -@@ -50,7 +50,7 @@ module Puppetserver +@@ -48,7 +48,7 @@ module Puppetserver def user_specific_conf_dir @user_specific_conf_dir ||= - if running_as_root? + if Puppetserver::Ca::Utils::Config.running_as_root? - '/etc/puppetlabs/puppet' + '%%PREFIX%%/etc/puppet' else "#{ENV['HOME']}/.puppetlabs/etc/puppet" end -@@ -102,7 +102,7 @@ module Puppetserver +@@ -100,7 +100,7 @@ module Puppetserver # defaults below base_defaults = [ [:confdir, user_specific_conf_dir], - [:ssldir,'$confdir/ssl'], + [:ssldir,'/var/puppet/ssl'], [:cadir, '$ssldir/ca'], [:certdir, '$ssldir/certs'], [:certname, default_certname],