diff options
9 files changed, 22 insertions, 21 deletions
diff --git a/sysutils/puppetserver6/Makefile b/sysutils/puppetserver6/Makefile index 71f518779094..34324737b81a 100644 --- a/sysutils/puppetserver6/Makefile +++ b/sysutils/puppetserver6/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= puppetserver -PORTVERSION= 6.0.0 +PORTVERSION= 6.0.1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 6 diff --git a/sysutils/puppetserver6/distinfo b/sysutils/puppetserver6/distinfo index 631915cfdfb6..56ba7fecf870 100644 --- a/sysutils/puppetserver6/distinfo +++ b/sysutils/puppetserver6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537339196 -SHA256 (puppetserver-6.0.0.tar.gz) = 5e289538d25d78856e72ac65b8f89334aff43ae9c290e4ed5052873c0749a2d7 -SIZE (puppetserver-6.0.0.tar.gz) = 62345355 +TIMESTAMP = 1538561651 +SHA256 (puppetserver-6.0.1.tar.gz) = 88bca683f6c73b364414f55f06a9a56e374f082e2ebd7da3870ac3ecbec0b6c5 +SIZE (puppetserver-6.0.1.tar.gz) = 62362369 diff --git a/sysutils/puppetserver6/files/patch-ext__bin__puppetserver b/sysutils/puppetserver6/files/patch-ext__bin__puppetserver index 15b8c8adf156..605a03f50931 100644 --- a/sysutils/puppetserver6/files/patch-ext__bin__puppetserver +++ b/sysutils/puppetserver6/files/patch-ext__bin__puppetserver @@ -1,6 +1,6 @@ ---- ext/bin/puppetserver.orig 2017-09-28 10:58:44.784311406 -0700 -+++ ext/bin/puppetserver 2017-09-28 11:00:46.034742764 -0700 -@@ -14,6 +14,12 @@ +--- ext/bin/puppetserver.orig 2018-10-03 16:18:58 UTC ++++ ext/bin/puppetserver +@@ -15,6 +15,12 @@ elif [ `uname` == "OpenBSD" ] ; then USER="_puppet" INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver" CONFIG="/etc/puppetlabs/puppetserver/conf.d" diff --git a/sysutils/puppetserver6/files/patch-ext__cli_defaults__cli-defaults.sh b/sysutils/puppetserver6/files/patch-ext__cli_defaults__cli-defaults.sh index 14431af83a0c..d5c27a11e506 100644 --- a/sysutils/puppetserver6/files/patch-ext__cli_defaults__cli-defaults.sh +++ b/sysutils/puppetserver6/files/patch-ext__cli_defaults__cli-defaults.sh @@ -1,5 +1,5 @@ ---- ext/cli_defaults/cli-defaults.sh.orig 2017-08-06 01:24:37.981353156 -0700 -+++ ext/cli_defaults/cli-defaults.sh 2017-08-06 01:39:53.280636611 -0700 +--- ext/cli_defaults/cli-defaults.sh.orig 2018-10-01 20:36:08 UTC ++++ ext/cli_defaults/cli-defaults.sh @@ -1,4 +1,4 @@ -INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver" +INSTALL_DIR="%%DATADIR%%" diff --git a/sysutils/puppetserver6/files/patch-ext__config__conf.d__global.conf b/sysutils/puppetserver6/files/patch-ext__config__conf.d__global.conf index a681368841de..5fc83d8e0ae8 100644 --- a/sysutils/puppetserver6/files/patch-ext__config__conf.d__global.conf +++ b/sysutils/puppetserver6/files/patch-ext__config__conf.d__global.conf @@ -1,5 +1,5 @@ ---- ext/config/conf.d/global.conf.orig 2017-08-02 20:34:12.049821329 -0700 -+++ ext/config/conf.d/global.conf 2017-08-02 20:35:03.130347445 -0700 +--- ext/config/conf.d/global.conf.orig 2018-10-01 20:36:05 UTC ++++ ext/config/conf.d/global.conf @@ -1,5 +1,5 @@ global: { # Path to logback logging configuration file; for more diff --git a/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf b/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf index 009674c3b8bc..16ade757eefa 100644 --- a/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf +++ b/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf @@ -1,6 +1,6 @@ ---- ext/config/conf.d/puppetserver.conf.orig 2017-08-02 20:01:48.229660631 -0700 -+++ ext/config/conf.d/puppetserver.conf 2017-08-04 14:00:29.705675760 -0700 -@@ -2,16 +2,20 @@ +--- ext/config/conf.d/puppetserver.conf.orig 2018-10-01 20:36:05 UTC ++++ ext/config/conf.d/puppetserver.conf +@@ -2,16 +2,21 @@ jruby-puppet: { # Where the puppet-agent dependency places puppet, facter, etc... # Puppet server expects to load Puppet from this location @@ -9,6 +9,7 @@ + %%RUBY_SITELIBDIR%%, + %%PREFIX%%/lib/ruby/vendor_ruby, + %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/semantic_puppet-1.0.2/lib, ++ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/multi_json-1.13.1/lib, + ] # This setting determines where JRuby will install gems. It is used for loading gems, @@ -24,7 +25,7 @@ # PLEASE NOTE: Use caution when modifying the below settings. Modifying # these settings will change the value of the corresponding Puppet settings -@@ -26,23 +30,23 @@ +@@ -26,23 +31,23 @@ jruby-puppet: { # (optional) path to puppet conf dir; if not specified, will use # /etc/puppetlabs/puppet diff --git a/sysutils/puppetserver6/files/patch-ext__config__conf.d__webserver.conf b/sysutils/puppetserver6/files/patch-ext__config__conf.d__webserver.conf index 573e0a605a01..21e4c5e6d868 100644 --- a/sysutils/puppetserver6/files/patch-ext__config__conf.d__webserver.conf +++ b/sysutils/puppetserver6/files/patch-ext__config__conf.d__webserver.conf @@ -1,4 +1,4 @@ ---- ext/config/conf.d/webserver.conf.orig 2016-03-28 10:32:26.000000000 -0700 +--- ext/config/conf.d/webserver.conf.orig 2018-10-01 20:36:05 UTC +++ ext/config/conf.d/webserver.conf @@ -1,5 +1,5 @@ webserver: { diff --git a/sysutils/puppetserver6/files/patch-ext__config__logback.xml b/sysutils/puppetserver6/files/patch-ext__config__logback.xml index cc04e1c1e8b9..278ccaf5f825 100644 --- a/sysutils/puppetserver6/files/patch-ext__config__logback.xml +++ b/sysutils/puppetserver6/files/patch-ext__config__logback.xml @@ -1,5 +1,5 @@ ---- ext/config/logback.xml.orig 2017-08-02 19:46:03.829675373 -0700 -+++ ext/config/logback.xml 2017-08-02 19:50:56.742766644 -0700 +--- ext/config/logback.xml.orig 2018-09-18 17:16:33 UTC ++++ ext/config/logback.xml @@ -6,12 +6,11 @@ </appender> diff --git a/sysutils/puppetserver6/files/patch-ext__config__request-logging.xml b/sysutils/puppetserver6/files/patch-ext__config__request-logging.xml index 587e091a7d69..4358008fdb47 100644 --- a/sysutils/puppetserver6/files/patch-ext__config__request-logging.xml +++ b/sysutils/puppetserver6/files/patch-ext__config__request-logging.xml @@ -1,7 +1,7 @@ ---- ext/config/request-logging.xml.orig 2016-12-03 22:32:37.248735656 -0800 -+++ ext/config/request-logging.xml 2016-12-03 22:37:39.489420010 -0800 +--- ext/config/request-logging.xml.orig 2018-09-18 17:16:33 UTC ++++ ext/config/request-logging.xml @@ -1,10 +1,10 @@ - <configuration debug="false" scan="true"> + <configuration debug="false"> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>/var/log/puppetlabs/puppetserver/puppetserver-access.log</file> + <file>/var/log/puppetserver/puppetserver-access.log</file> |