aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils/rubygem-puppetserver-ca/files
diff options
context:
space:
mode:
authorromain <romain@FreeBSD.org>2018-09-28 18:47:01 +0800
committerromain <romain@FreeBSD.org>2018-09-28 18:47:01 +0800
commit1f57af0df996b424efa654d4af882fc722b274af (patch)
tree5095b00a12e4d37219ec4c019813c8bb1de3321e /sysutils/rubygem-puppetserver-ca/files
parent673b5a6f455e501e5a3fa837ac7626e1058989d3 (diff)
downloadfreebsd-ports-gnome-1f57af0df996b424efa654d4af882fc722b274af.tar.gz
freebsd-ports-gnome-1f57af0df996b424efa654d4af882fc722b274af.tar.zst
freebsd-ports-gnome-1f57af0df996b424efa654d4af882fc722b274af.zip
Update to 1.1.1
With hat: puppet
Diffstat (limited to 'sysutils/rubygem-puppetserver-ca/files')
-rw-r--r--sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb8
1 files changed, 4 insertions, 4 deletions
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 a12cfbad8e0d..16803b246238 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
@@ -1,15 +1,15 @@
---- 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],