From nobody Sat Apr 29 01:36:28 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7XBN4gk8z48Fgw; Sat, 29 Apr 2023 01:36:28 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7XBN3MGyz42Ll; Sat, 29 Apr 2023 01:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682732188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SeYmd7kq9TIoOqk3KYFyIjUxcqgFu27jVayAYmvA+Uo=; b=DqX/uCVZvfGG1ZQiGpUR4n3nR5I8nZF8M2v9aZyQsE8U76bf3X8rADwDrFJ5tggeV9KhUI 60uB+f7Acvmeki+w6HowCQ3jMFNjsMrLyV7/atihmUhD4hztRVR5WqWYHRZKvct8Wc8ux+ uWklpq5j63PhxYmtJcnyysE/h0KIMOwn79Npi6Ly4N8b/OnzYqR4E0oeE1yRZetSyYmZ+T wj7j5sFnoGjGCCojAccwKbg+PQ27EXymsqG6PVnQ7K5GNteJXPypYO53IZg/djUZg1UT0G lqlaJF8Ny+VtMI0DC50Y+Vj6s1TZBcNC/atABThpIwAfSyNndm3DodTy2n6Wbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682732188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SeYmd7kq9TIoOqk3KYFyIjUxcqgFu27jVayAYmvA+Uo=; b=m59pSt6E5SrWtqvaV4dwzFMHEVNF7kMkpAxQJPqyNzDjsNXCuUeEnxKegGVuFCBf3jpjcS 5Fj/UDnvZG3BgeV8mnWrezIlGYr9Xsj+CSxi+1H0cOE9M65P9tbhG/QN+7u/50vz6zSZ7t +khNTmSxcSvjNmtlECSA2qRDGKz2ViPWKC/q0BzSBE15M1WSvnWUWTlNlbhUeYPp2w/z3Z xNtFDS9RcNfUxsMeIfoBjSMVkfeq2hNQde6BGeomBnCSZAxC2dn6AkxMtEkFBf3f/cqp/r 00X3Y0+8VmTyVy8KQoYZPyI4UEsugcLoozV6UFL6uj/JSw2d7ul4j+mudyq96g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682732188; a=rsa-sha256; cv=none; b=Dk5wF9JszcdN25igZv2AZe96DMKMLsCrEJTkAz4pQrJ0/8ha7XtF1zTVXO0mvVIxZ3DG7L pNk6o3iJCVdz6+HlyOhc0E3g5lTJw8kr1VLccjtgh7qy5lMMvQSeQURTn1u8jOns6Tt11k sM+sswUyg3VBYmdDx9h87qYTWpaeIZUm70YYO+1TkavzFs3dyUbuaSqMatmaNFOERAEwz/ ZuldH4YbHhUR+/sx09zYD98Gb8+3TI5E/fHlnqa7JdQcgQJX8/JBzGWnn71yjrXMeXrexz AWTZws0MkHa3bIQ9a0ryNmx4yX2IrIwQNyX6TqMOvEDAyVcvirVtqzoryAUNIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7XBN1YvYzNSG; Sat, 29 Apr 2023 01:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T1aSbF069493; Sat, 29 Apr 2023 01:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T1aSMQ069492; Sat, 29 Apr 2023 01:36:28 GMT (envelope-from git) Date: Sat, 29 Apr 2023 01:36:28 GMT Message-Id: <202304290136.33T1aSMQ069492@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: e9c5ed32578f - main - sysutils/puppetserver8: New port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9c5ed32578f79b7324aab9ba9fe5d2b76a089a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9c5ed32578f79b7324aab9ba9fe5d2b76a089a2 commit e9c5ed32578f79b7324aab9ba9fe5d2b76a089a2 Author: Romain Tartière AuthorDate: 2023-04-28 21:00:54 +0000 Commit: Romain Tartière CommitDate: 2023-04-29 01:36:10 +0000 sysutils/puppetserver8: New port Puppet master is a Ruby application that compiles configurations for any number of Puppet agent nodes, using Puppet code and various other data sources. (For more info, see Overview of Puppet's Architecture.) Puppet Server is an application that runs on the Java Virtual Machine (JVM) and provides the same services as the classic Puppet master application. It mostly does this by running the existing Puppet master code in several JRuby interpreters, but it replaces some parts of the classic application with new services written in Clojure. --- sysutils/Makefile | 1 + sysutils/puppetserver6/Makefile | 2 +- sysutils/puppetserver7/Makefile | 2 +- sysutils/puppetserver8/Makefile | 93 +++++++++++++++++++++ sysutils/puppetserver8/distinfo | 3 + .../files/patch-ext__bin__puppetserver | 15 ++++ .../puppetserver8/files/patch-ext__cli__foreground | 19 +++++ .../files/patch-ext__cli_defaults__cli-defaults.sh | 12 +++ .../files/patch-ext__config__conf.d__global.conf | 9 ++ .../patch-ext__config__conf.d__puppetserver.conf | 55 +++++++++++++ .../patch-ext__config__conf.d__webserver.conf | 9 ++ .../files/patch-ext__config__logback.xml | 17 ++++ .../files/patch-ext__config__request-logging.xml | 15 ++++ .../files/patch-ext__ezbake-functions.sh | 11 +++ sysutils/puppetserver8/files/pkg-message.in | 17 ++++ sysutils/puppetserver8/files/puppetserver.in | 95 ++++++++++++++++++++++ sysutils/puppetserver8/pkg-descr | 11 +++ sysutils/puppetserver8/pkg-plist | 29 +++++++ 18 files changed, 413 insertions(+), 2 deletions(-) diff --git a/sysutils/Makefile b/sysutils/Makefile index b083a01344eb..4335459241c2 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1061,6 +1061,7 @@ SUBDIR += puppet8 SUBDIR += puppetserver6 SUBDIR += puppetserver7 + SUBDIR += puppetserver8 SUBDIR += pv SUBDIR += pwd_unmkdb SUBDIR += pwgen diff --git a/sysutils/puppetserver6/Makefile b/sysutils/puppetserver6/Makefile index 751c3609d699..e3d21abf31be 100644 --- a/sysutils/puppetserver6/Makefile +++ b/sysutils/puppetserver6/Makefile @@ -31,7 +31,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 8+ -CONFLICTS_INSTALL= puppetserver7 +CONFLICTS_INSTALL= puppetserver[0-9] SHEBANG_FILES= ext/bin/puppetserver diff --git a/sysutils/puppetserver7/Makefile b/sysutils/puppetserver7/Makefile index c73024cdc921..f88f4174befc 100644 --- a/sysutils/puppetserver7/Makefile +++ b/sysutils/puppetserver7/Makefile @@ -28,7 +28,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 8+ -CONFLICTS_INSTALL= puppetserver5 puppetserver6 +CONFLICTS_INSTALL= puppetserver[0-9] SHEBANG_FILES= ext/bin/puppetserver diff --git a/sysutils/puppetserver8/Makefile b/sysutils/puppetserver8/Makefile new file mode 100644 index 000000000000..7b38e8445f60 --- /dev/null +++ b/sysutils/puppetserver8/Makefile @@ -0,0 +1,93 @@ +PORTNAME= puppetserver +PORTVERSION= 8.0.0 +CATEGORIES= sysutils java +MASTER_SITES= https://downloads.puppetlabs.com/puppet/ +PKGNAMESUFFIX= 8 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} + +MAINTAINER= puppet@FreeBSD.org +COMMENT= Puppet Server running in the JVM +WWW= https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserver.html + +LICENSE= APACHE20 + +ONLY_FOR_ARCHS= amd64 + +RUN_DEPENDS= bash>=0:shells/bash \ + puppet8>=8.0:sysutils/puppet8 \ + rubygem-puppetserver-ca>=1:sysutils/rubygem-puppetserver-ca \ + rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \ + sudo>=1:security/sudo + +USES= ruby shebangfix +USE_RC_SUBR= puppetserver + +USE_JAVA= yes +NO_ARCH= yes +NO_BUILD= yes +JAVA_VERSION= 8+ + +CONFLICTS_INSTALL= puppetserver[0-9] + +SHEBANG_FILES= ext/bin/puppetserver + +USERS= puppet +GROUPS= puppet + +SUB_LIST= JAVA_HOME=${JAVA_HOME} +SUB_FILES= pkg-message + +post-patch: +.for file in ext/config/logback.xml ext/config/request-logging.xml \ + ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \ + ext/config/conf.d/web-routes.conf ext/config/conf.d/webserver.conf \ + ext/config/conf.d/auth.conf ext/config/services.d/ca.cfg \ + ext/system-config/services.d/bootstrap.cfg ext/bin/puppetserver \ + ext/cli_defaults/cli-defaults.sh ext/cli/foreground + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ + -e 's|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|' \ + -e 's|%%RUBY_VER%%|${RUBY_VER}|' \ + -e 's|%%JAVA%%|${JAVA}|' \ + -e 's|%%ETCDIR%%|${ETCDIR}|' \ + -e 's|%%DATADIR%%|${DATADIR}|' \ + ${WRKSRC}/${file} +.endfor + @${REINPLACE_CMD} -e 's|#!/opt/puppetlabs/puppet/bin/ruby|#!${RUBY}|' \ + ${WRKSRC}/ext/cli/ca \ + ${WRKSRC}/ext/cli/dropsonde + +do-install: + @${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps + @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d + @${MKDIR} ${STAGEDIR}${ETCDIR}/services.d + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code + @${MKDIR} ${STAGEDIR}/var/log/puppetserver + @${MKDIR} ${STAGEDIR}/var/puppet/server + @${MKDIR} ${STAGEDIR}/var/puppet/server/data + @${MKDIR} ${STAGEDIR}/var/puppetserver + @${MKDIR} ${STAGEDIR}/var/run/puppetserver + ${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/metrics.conf ${STAGEDIR}${ETCDIR}/conf.d/metrics.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/services.d/ca.cfg ${STAGEDIR}${ETCDIR}/services.d/ca.cfg.sample + ${INSTALL_DATA} ${WRKSRC}/ext/system-config/services.d/bootstrap.cfg ${STAGEDIR}${ETCDIR}/services.d/bootstrap.cfg.sample + ${INSTALL_DATA} ${WRKSRC}/ext/bin/puppetserver ${STAGEDIR}${PREFIX}/bin/puppetserver + ${INSTALL_DATA} ${WRKSRC}/ext/ezbake-functions.sh ${STAGEDIR}${DATADIR}/ezbake-functions.sh + ${INSTALL_DATA} ${WRKSRC}/ext/cli/ca ${STAGEDIR}${DATADIR}/cli/apps/ca + ${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground + ${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem + ${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb + ${INSTALL_DATA} ${WRKSRC}/ext/cli/reload ${STAGEDIR}${DATADIR}/cli/apps/reload + ${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby + ${INSTALL_DATA} ${WRKSRC}/ext/cli/start ${STAGEDIR}${DATADIR}/cli/apps/start + ${INSTALL_DATA} ${WRKSRC}/ext/cli/stop ${STAGEDIR}${DATADIR}/cli/apps/stop + ${INSTALL_DATA} ${WRKSRC}/ext/cli_defaults/cli-defaults.sh ${STAGEDIR}${DATADIR}/cli/cli-defaults.sh + +.include diff --git a/sysutils/puppetserver8/distinfo b/sysutils/puppetserver8/distinfo new file mode 100644 index 000000000000..714022b2eed1 --- /dev/null +++ b/sysutils/puppetserver8/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1682476133 +SHA256 (puppetserver-8.0.0.tar.gz) = 645308576da1a7eadc2553dac9cc7da8f3ad6c22a49a08f19153f5a21bb2fd84 +SIZE (puppetserver-8.0.0.tar.gz) = 60976845 diff --git a/sysutils/puppetserver8/files/patch-ext__bin__puppetserver b/sysutils/puppetserver8/files/patch-ext__bin__puppetserver new file mode 100644 index 000000000000..fb17e51c6fde --- /dev/null +++ b/sysutils/puppetserver8/files/patch-ext__bin__puppetserver @@ -0,0 +1,15 @@ +--- 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" ++elif [ `uname` == "FreeBSD" ] ; then ++ JAVA_BIN="%%JAVA%%" ++ JAVA_ARGS="-Xms2g -Xmx2g" ++ USER="puppet" ++ INSTALL_DIR="%%DATADIR%%" ++ CONFIG="%%ETCDIR%%/conf.d" + else + echo "You seem to be missing some important configuration files; could not find /etc/default/puppetserver or /etc/sysconfig/puppetserver" >&2 + exit 1 diff --git a/sysutils/puppetserver8/files/patch-ext__cli__foreground b/sysutils/puppetserver8/files/patch-ext__cli__foreground new file mode 100644 index 000000000000..a4a4a5ad6649 --- /dev/null +++ b/sysutils/puppetserver8/files/patch-ext__cli__foreground @@ -0,0 +1,19 @@ +--- ext/cli/foreground.orig 2019-09-17 14:05:56 UTC ++++ ext/cli/foreground +@@ -1,6 +1,6 @@ + #!/usr/bin/env bash + +-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter" ++restartfile="/var/puppet/server/data/puppetserver/restartcounter" + cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh + + if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then +@@ -30,7 +30,7 @@ fi + COMMAND="${JAVA_BIN} ${JAVA_ARGS} ${LOG_APPENDER} \ + -cp "$CLASSPATH" \ + clojure.main -m puppetlabs.trapperkeeper.main \ +- --config ${CONFIG} --bootstrap-config ${BOOTSTRAP_CONFIG} \ ++ --config ${CONFIG} --bootstrap-config %%ETCDIR%%/services.d \ + --restart-file "${restartfile}" \ + ${TK_ARGS} \ + ${@}" diff --git a/sysutils/puppetserver8/files/patch-ext__cli_defaults__cli-defaults.sh b/sysutils/puppetserver8/files/patch-ext__cli_defaults__cli-defaults.sh new file mode 100644 index 000000000000..85febc64943c --- /dev/null +++ b/sysutils/puppetserver8/files/patch-ext__cli_defaults__cli-defaults.sh @@ -0,0 +1,12 @@ +--- ext/cli_defaults/cli-defaults.sh.orig 2019-09-17 14:05:56 UTC ++++ ext/cli_defaults/cli-defaults.sh +@@ -1,7 +1,7 @@ +-INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver" ++INSTALL_DIR="%%DATADIR%%" + + if [ -n "$JRUBY_JAR" ]; then + echo "Warning: the JRUBY_JAR setting is no longer needed and will be ignored." 1>&2 + fi + +-CLASSPATH="${CLASSPATH}:/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/facter.jar:/opt/puppetlabs/server/data/puppetserver/jars/*" ++CLASSPATH="${CLASSPATH}:/usr/local/lib/ruby/vendor_ruby/facter.jar:/opt/puppetlabs/server/data/puppetserver/jars/*" diff --git a/sysutils/puppetserver8/files/patch-ext__config__conf.d__global.conf b/sysutils/puppetserver8/files/patch-ext__config__conf.d__global.conf new file mode 100644 index 000000000000..5fc83d8e0ae8 --- /dev/null +++ b/sysutils/puppetserver8/files/patch-ext__config__conf.d__global.conf @@ -0,0 +1,9 @@ +--- 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 + # info, see http://logback.qos.ch/manual/configuration.html +- logging-config: /etc/puppetlabs/puppetserver/logback.xml ++ logging-config: %%PREFIX%%/etc/puppetserver/logback.xml + } diff --git a/sysutils/puppetserver8/files/patch-ext__config__conf.d__puppetserver.conf b/sysutils/puppetserver8/files/patch-ext__config__conf.d__puppetserver.conf new file mode 100644 index 000000000000..335690c0d1cb --- /dev/null +++ b/sysutils/puppetserver8/files/patch-ext__config__conf.d__puppetserver.conf @@ -0,0 +1,55 @@ +--- ext/config/conf.d/puppetserver.conf.orig 2021-03-12 18:01:54 UTC ++++ ext/config/conf.d/puppetserver.conf +@@ -2,16 +2,20 @@ + jruby-puppet: { + # Where the puppet-agent dependency places puppet, facter, etc... + # Puppet server expects to load Puppet from this location +- ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby] ++ ruby-load-path: [ ++ %%PREFIX%%/share/puppetserver/lib, ++ %%RUBY_SITELIBDIR%%, ++ %%PREFIX%%/lib/ruby/vendor_ruby, ++ ] + + # This setting determines where JRuby will install gems. It is used for loading gems, + # and also by the `puppetserver gem` command line tool. +- gem-home: /opt/puppetlabs/server/data/puppetserver/jruby-gems ++ gem-home: /var/puppet/server/data/puppetserver/jruby-gems + + # This setting defines the complete "GEM_PATH" for jruby. If set, it should include + # the gem-home directory as well as any other directories that gems can be loaded + # from (including the vendored gems directory for gems that ship with puppetserver) +- gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems", "/opt/puppetlabs/puppet/lib/ruby/vendor_gems"] ++ gem-path: [${jruby-puppet.gem-home}, "/var/puppet/server/data/puppetserver/vendored-jruby-gems", "%%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%"] + + # 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 @@ jruby-puppet: { + + # (optional) path to puppet conf dir; if not specified, will use + # /etc/puppetlabs/puppet +- server-conf-dir: /etc/puppetlabs/puppet ++ server-conf-dir: %%PREFIX%%/etc/puppet + + # (optional) path to puppet code dir; if not specified, will use + # /etc/puppetlabs/code +- server-code-dir: /etc/puppetlabs/code ++ server-code-dir: %%PREFIX%%/etc/puppet/code + + # (optional) path to puppet var dir; if not specified, will use + # /opt/puppetlabs/server/data/puppetserver +- server-var-dir: /opt/puppetlabs/server/data/puppetserver ++ server-var-dir: /var/puppet/server/data/puppetserver + + # (optional) path to puppet run dir; if not specified, will use + # /var/run/puppetlabs/puppetserver +- server-run-dir: /var/run/puppetlabs/puppetserver ++ server-run-dir: /var/run/puppetserver + + # (optional) path to puppet log dir; if not specified, will use + # /var/log/puppetlabs/puppetserver +- server-log-dir: /var/log/puppetlabs/puppetserver ++ server-log-dir: /var/log/puppetserver + + # (optional) maximum number of JRuby instances to allow + #max-active-instances: 1 diff --git a/sysutils/puppetserver8/files/patch-ext__config__conf.d__webserver.conf b/sysutils/puppetserver8/files/patch-ext__config__conf.d__webserver.conf new file mode 100644 index 000000000000..21e4c5e6d868 --- /dev/null +++ b/sysutils/puppetserver8/files/patch-ext__config__conf.d__webserver.conf @@ -0,0 +1,9 @@ +--- 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: { +- access-log-config: /etc/puppetlabs/puppetserver/request-logging.xml ++ access-log-config: %%PREFIX%%/etc/puppetserver/request-logging.xml + client-auth: want + ssl-host: 0.0.0.0 + ssl-port: 8140 diff --git a/sysutils/puppetserver8/files/patch-ext__config__logback.xml b/sysutils/puppetserver8/files/patch-ext__config__logback.xml new file mode 100644 index 000000000000..278ccaf5f825 --- /dev/null +++ b/sysutils/puppetserver8/files/patch-ext__config__logback.xml @@ -0,0 +1,17 @@ +--- ext/config/logback.xml.orig 2018-09-18 17:16:33 UTC ++++ ext/config/logback.xml +@@ -6,12 +6,11 @@ + + + +- +- /var/log/puppetlabs/puppetserver/puppetserver.log ++ /var/log/puppetserver/puppetserver.log + true + + +- /var/log/puppetlabs/puppetserver/puppetserver-%d{yyyy-MM-dd}.%i.log.gz ++ /var/log/puppetserver/puppetserver-%d{yyyy-MM-dd}.%i.log.gz + + 200MB + 90 diff --git a/sysutils/puppetserver8/files/patch-ext__config__request-logging.xml b/sysutils/puppetserver8/files/patch-ext__config__request-logging.xml new file mode 100644 index 000000000000..4358008fdb47 --- /dev/null +++ b/sysutils/puppetserver8/files/patch-ext__config__request-logging.xml @@ -0,0 +1,15 @@ +--- ext/config/request-logging.xml.orig 2018-09-18 17:16:33 UTC ++++ ext/config/request-logging.xml +@@ -1,10 +1,10 @@ + + +- /var/log/puppetlabs/puppetserver/puppetserver-access.log ++ /var/log/puppetserver/puppetserver-access.log + true + + +- /var/log/puppetlabs/puppetserver/puppetserver-access-%d{yyyy-MM-dd}.%i.log.gz ++ /var/log/puppetserver/puppetserver-access-%d{yyyy-MM-dd}.%i.log.zip + + 200MB + 90 diff --git a/sysutils/puppetserver8/files/patch-ext__ezbake-functions.sh b/sysutils/puppetserver8/files/patch-ext__ezbake-functions.sh new file mode 100644 index 000000000000..bd4d0a1c26b7 --- /dev/null +++ b/sysutils/puppetserver8/files/patch-ext__ezbake-functions.sh @@ -0,0 +1,11 @@ +--- ext/ezbake-functions.sh.orig 2019-09-17 14:05:56 UTC ++++ ext/ezbake-functions.sh +@@ -126,7 +126,7 @@ init_restart_file() + local group="${GROUP:-puppet}" + + if [ ! -e "$restartfile" ]; then +- /usr/bin/install --directory --owner=$user --group=$group --mode=755 "$restart_file_base_dir" ++ /usr/bin/install -d -o $user -g $group -m 755 "$restart_file_base_dir" + if [ $? -ne 0 ]; then + echo "Unable to create or set permissions for restart file at ${restart_file_base_dir}" 1>&2 + return 1 diff --git a/sysutils/puppetserver8/files/pkg-message.in b/sysutils/puppetserver8/files/pkg-message.in new file mode 100644 index 000000000000..0635f9786fce --- /dev/null +++ b/sysutils/puppetserver8/files/pkg-message.in @@ -0,0 +1,17 @@ +[ +{ type: install + message: <