From owner-svn-ports-all@freebsd.org Fri Nov 6 22:10:35 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4D0CC2D4953; Fri, 6 Nov 2020 22:10:35 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CSZMb1BWlz4rXl; Fri, 6 Nov 2020 22:10:35 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1BD482C020; Fri, 6 Nov 2020 22:10:35 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A6MAYtE000565; Fri, 6 Nov 2020 22:10:34 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A6MAYs7000562; Fri, 6 Nov 2020 22:10:34 GMT (envelope-from romain@FreeBSD.org) Message-Id: <202011062210.0A6MAYs7000562@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Fri, 6 Nov 2020 22:10:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554328 - in head/sysutils/rubygem-puppetserver-ca: . files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/sysutils/rubygem-puppetserver-ca: . files X-SVN-Commit-Revision: 554328 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2020 22:10:35 -0000 Author: romain Date: Fri Nov 6 22:10:34 2020 New Revision: 554328 URL: https://svnweb.freebsd.org/changeset/ports/554328 Log: Update to 2.0.0 With hat: puppet Modified: head/sysutils/rubygem-puppetserver-ca/Makefile head/sysutils/rubygem-puppetserver-ca/distinfo 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 Nov 6 22:09:56 2020 (r554327) +++ head/sysutils/rubygem-puppetserver-ca/Makefile Fri Nov 6 22:10:34 2020 (r554328) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= puppetserver-ca -PORTVERSION= 1.8.0 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG @@ -16,9 +15,5 @@ USES= gem USE_RUBY= yes PLIST_FILES= bin/puppetserver-ca - -post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ - ${WRKSRC}/lib/puppetserver/ca/config/puppet.rb .include Modified: head/sysutils/rubygem-puppetserver-ca/distinfo ============================================================================== --- head/sysutils/rubygem-puppetserver-ca/distinfo Fri Nov 6 22:09:56 2020 (r554327) +++ head/sysutils/rubygem-puppetserver-ca/distinfo Fri Nov 6 22:10:34 2020 (r554328) @@ -1,3 +1,3 @@ -TIMESTAMP = 1591137740 -SHA256 (rubygem/puppetserver-ca-1.8.0.gem) = 3783e2d89a8652726166b0768aabcca670119c7166465ce430cdc9a1853c3bce -SIZE (rubygem/puppetserver-ca-1.8.0.gem) = 36352 +TIMESTAMP = 1604633593 +SHA256 (rubygem/puppetserver-ca-2.0.0.gem) = cbba83ce1058819b966b76b0070f45e7c5c343bbc722878b396e648ee57e0b7a +SIZE (rubygem/puppetserver-ca-2.0.0.gem) = 37888 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 Nov 6 22:09:56 2020 (r554327) +++ head/sysutils/rubygem-puppetserver-ca/files/patch-lib_puppetserver_ca_config_puppet.rb Fri Nov 6 22:10:34 2020 (r554328) @@ -1,20 +1,11 @@ ---- lib/puppetserver/ca/config/puppet.rb.orig 2018-09-28 10:36:20 UTC +--- lib/puppetserver/ca/config/puppet.rb.orig 2020-11-06 21:46:06 UTC +++ lib/puppetserver/ca/config/puppet.rb -@@ -48,7 +48,7 @@ module Puppetserver - def user_specific_conf_dir - @user_specific_conf_dir ||= - if Puppetserver::Ca::Utils::Config.running_as_root? -- '/etc/puppetlabs/puppet' -+ '%%PREFIX%%/etc/puppet' - else - "#{ENV['HOME']}/.puppetlabs/etc/puppet" - end -@@ -100,7 +100,7 @@ module Puppetserver +@@ -97,7 +97,7 @@ module Puppetserver # defaults below base_defaults = [ - [:confdir, user_specific_conf_dir], + [:confdir, user_specific_puppet_confdir], - [:ssldir,'$confdir/ssl'], + [:ssldir,'/var/puppet/ssl'], - [:cadir, '$ssldir/ca'], [:certdir, '$ssldir/certs'], [:certname, default_certname], + [:server, 'puppet'],