diff options
Diffstat (limited to 'sysutils')
23 files changed, 0 insertions, 706 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 3a497f333125..ed294dc1fb2c 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -984,10 +984,8 @@ SUBDIR += pstree SUBDIR += puppet-lint SUBDIR += puppet-mode.el - SUBDIR += puppet5 SUBDIR += puppet6 SUBDIR += puppet7 - SUBDIR += puppetserver5 SUBDIR += puppetserver6 SUBDIR += puppetserver7 SUBDIR += pv diff --git a/sysutils/puppet5/Makefile b/sysutils/puppet5/Makefile deleted file mode 100644 index af911e2d895c..000000000000 --- a/sysutils/puppet5/Makefile +++ /dev/null @@ -1,114 +0,0 @@ -PORTNAME= puppet -PORTVERSION= 5.5.22 -PORTREVISION= 1 -CATEGORIES= sysutils -MASTER_SITES= https://downloads.puppetlabs.com/puppet/ -PKGNAMESUFFIX= 5 - -MAINTAINER= puppet@FreeBSD.org -COMMENT= Configuration management framework written in Ruby - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Puppet 5 has reached EOL -EXPIRATION_DATE=2021-07-01 -# maybe a newer version like puppet 6.x or 7.x must be used to work with ruby 2.7 -BROKEN_RUBY27= yes - -RUN_DEPENDS= rubygem-fast_gettext1>=1.1.2:devel/rubygem-fast_gettext1 \ - rubygem-hiera>=3.2.1:sysutils/rubygem-hiera \ - rubygem-locale>=2.1:devel/rubygem-locale \ - rubygem-multi_json>=1.10:devel/rubygem-multi_json - -USES= cpe -CPE_VENDOR= puppetlabs -CONFLICTS_INSTALL= puppet6-* puppet7-* -NO_ARCH= yes -NO_BUILD= yes -USE_RUBY= yes -USE_RC_SUBR= puppet puppetmaster -PORTDOCS= LICENSE README.md -PORTEXAMPLES= * -USERS= puppet -GROUPS= puppet -SUB_FILES+= pkg-message -SUB_LIST= RUBY=${RUBY} - -OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_DEFAULT= CFACTER -OPTIONS_RADIO= FACTER -OPTIONS_RADIO_FACTER= CFACTER RFACTER - -RFACTER_DESC= Use facter 4.x (future facter, written in Ruby) -CFACTER_DESC= Use facter 3.x (written in C++) - -RFACTER_BUILD_DEPENDS= rubygem-facter>=4.0:sysutils/rubygem-facter -RFACTER_RUN_DEPENDS= rubygem-facter>=4.0:sysutils/rubygem-facter - -CFACTER_BUILD_DEPENDS= facter>=3.0:sysutils/facter -CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter - -post-patch: - @${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/reference/configuration.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/etc/puppetlabs/code|${ETCDIR}|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/reference/configuration.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/cache|/var/puppet|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/reference/configuration.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/var/run/puppetlabs|/var/run/puppet|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/var/log/puppetlabs/puppet|/var/log/puppet|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/modules|" \ - ${WRKSRC}/lib/puppet/defaults.rb - @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/bin/gem|${LOCALBASE}/bin/gem|" \ - ${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb - @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ - ${WRKSRC}/lib/puppet/defaults.rb - @${REINPLACE_CMD} -e "s|\.\./\.\./\.\./locales|../locales|" \ - ${WRKSRC}/lib/puppet/gettext/config.rb - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \ - ${WRKSRC}/ext/rack/config.ru - -do-install: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ - --localedir=${RUBY_SITELIBDIR}/puppet/locales - -post-install: - ${MKDIR} ${STAGEDIR}${ETCDIR}/manifests - ${MKDIR} ${STAGEDIR}${ETCDIR}/modules - ${MKDIR} ${STAGEDIR}/var/puppet - ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist - ${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ - --confdir=${ETCDIR} \ - --rundir=/var/run/puppet \ - --vardir=/var/puppet \ - --logdir=/var/log/puppet \ - --codedir=${ETCDIR} \ - > ${STAGEDIR}${ETCDIR}/puppet.conf-dist - @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \ - ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ - ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} - @${MKDIR} ${STAGEDIR}${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR} - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} - -post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR} - -.include <bsd.port.mk> diff --git a/sysutils/puppet5/distinfo b/sysutils/puppet5/distinfo deleted file mode 100644 index 60598fdd908f..000000000000 --- a/sysutils/puppet5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1603306720 -SHA256 (puppet-5.5.22.tar.gz) = 2f7c68887f823a4b1f25c810702faf730779d5347d16bb604666f3c445ccc0ed -SIZE (puppet-5.5.22.tar.gz) = 2998132 diff --git a/sysutils/puppet5/files/patch-ext__rack__config.ru b/sysutils/puppet5/files/patch-ext__rack__config.ru deleted file mode 100644 index 51facb111557..000000000000 --- a/sysutils/puppet5/files/patch-ext__rack__config.ru +++ /dev/null @@ -1,19 +0,0 @@ ---- ext/rack/config.ru.orig 2015-08-09 23:14:59 UTC -+++ ext/rack/config.ru -@@ -14,11 +14,11 @@ ARGV << "--rack" - # Rack applications typically don't start as root. Set --confdir, --vardir, - # --logdir, --rundir to prevent reading configuration from - # ~/ based pathing. --ARGV << "--confdir" << "/etc/puppetlabs/puppet" --ARGV << "--vardir" << "/opt/puppetlabs/server/data/puppetmaster" --ARGV << "--logdir" << "/var/log/puppetlabs/puppetmaster" --ARGV << "--rundir" << "/var/run/puppetlabs/puppetmaster" --ARGV << "--codedir" << "/etc/puppetlabs/code" -+ARGV << "--confdir" << "%%PREFIX%%/etc/puppet" -+ARGV << "--vardir" << "/var/puppet" -+ARGV << "--logdir" << "/var/log/puppet" -+ARGV << "--rundir" << "/var/run/puppet" -+ARGV << "--codedir" << "%%PREFIX%%/etc/puppet" - - # always_cache_features is a performance improvement and safe for a master to - # apply. This is intended to allow agents to recognize new features that may be diff --git a/sysutils/puppet5/files/patch-lib_puppet_provider_service_daemontools.rb b/sysutils/puppet5/files/patch-lib_puppet_provider_service_daemontools.rb deleted file mode 100644 index 3857c824a1ba..000000000000 --- a/sysutils/puppet5/files/patch-lib_puppet_provider_service_daemontools.rb +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/puppet/provider/service/daemontools.rb.orig 2016-04-25 18:52:09 UTC -+++ lib/puppet/provider/service/daemontools.rb -@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :dae - - EOT - -- commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat" -+ commands :svc => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat" - - class << self - attr_writer :defpath -@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :dae - # find the service dir on this node - def servicedir - unless @servicedir -- ["/service", "/etc/service","/var/lib/svscan"].each do |path| -+ ["/var/service", "/etc/service","/var/lib/svscan"].each do |path| - if Puppet::FileSystem.exist?(path) - @servicedir = path - break diff --git a/sysutils/puppet5/files/pkg-message.in b/sysutils/puppet5/files/pkg-message.in deleted file mode 100644 index b7f42c483592..000000000000 --- a/sysutils/puppet5/files/pkg-message.in +++ /dev/null @@ -1,18 +0,0 @@ -[ -{ type: install - message: <<EOM -To enable the puppet agent, add the following to /etc/rc.conf: - - puppet_enable="YES" - -To enable the puppetmaster, add the following to /etc/rc.conf: - - puppetmaster_enable="YES" - -Individual config files such as %%PREFIX%%/etc/puppetmasterd.conf are -deprecated. Use a single file, %%ETCDIR%%/puppet.conf. - -The default PID directory is /var/run/puppet -EOM -} -] diff --git a/sysutils/puppet5/files/puppet.in b/sysutils/puppet5/files/puppet.in deleted file mode 100644 index fbdfef003ed5..000000000000 --- a/sysutils/puppet5/files/puppet.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -# PROVIDE: puppet -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable the puppet agent: -# -# puppet_enable="YES" - -. /etc/rc.subr - -name="puppet" -rcvar=puppet_enable - -load_rc_config "$name" - -: ${puppet_enable="NO"} -: ${puppet_rundir="/var/run/puppet"} - -command="%%PREFIX%%/bin/puppet" -command_args="agent ${puppet_flags} --rundir=${puppet_rundir}" -command_interpreter=%%RUBY%% -unset puppet_flags - -pidfile="${puppet_rundir}/agent.pid" -start_precmd="install -d -o puppet -g puppet ${pidfile%/*}" - -PATH="${PATH}:%%PREFIX%%/bin:%%PREFIX%%/sbin" - -# An UTF-8 locale is required -: LC_ALL=${LC_ALL:=C.UTF-8} -case $LC_ALL in - *.UTF-8) - ;; - *.*) - LC_ALL="${LC_ALL%.*}.UTF-8" - ;; - *) - LC_ALL=C.UTF-8 - ;; -esac -export LC_ALL - -run_rc_command "$1" diff --git a/sysutils/puppet5/files/puppetmaster.in b/sysutils/puppet5/files/puppetmaster.in deleted file mode 100644 index fcd0fffe74c9..000000000000 --- a/sysutils/puppet5/files/puppetmaster.in +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -# PROVIDE: puppetmaster -# REQUIRE: LOGIN - -# Add the following lines to /etc/rc.conf to enable the puppetmaster: -# -# puppetmaster_enable="YES" -# - -. /etc/rc.subr - -name="puppetmaster" -rcvar=puppetmaster_enable - -load_rc_config "${name}" - -: ${puppetmaster_enable="NO"} -: ${puppetmaster_rundir="/var/run/puppet"} -: ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"} - -command_interpreter=%%RUBY%% -command="%%PREFIX%%/bin/puppet" -command_args="master ${puppetmaster_flags}" -unset puppetmaster_flags - -pidfile="${puppetmaster_rundir}/master.pid" - -start_precmd="puppetmaster_checkconfig" -restart_precmd="puppetmaster_checkconfig" -puppetmaster_checkconfig() { - puppet_manifest="$($command config print --section=main manifest 2> /dev/null)" - cat << EOT -================================================================================ -The Rack and WEBrick Puppet master servers are deprecated and will be removed -in a future release. Please use Puppet Server instead (sysutils/puppetserver5). - -See http://links.puppet.com/deprecate-rack-webrick-servers for more information. -================================================================================ -EOT - echo -n "Performing sanity check of ${name} configuration: " - if ! ${command} parser validate "${puppet_manifest}" - then - echo "FAILED" - return 1 - else - echo "OK" - return 0 - fi -} - -if [ -z "${puppetmaster_mongrel_ports}" ]; then - run_rc_command "$1" -else - for port in ${puppetmaster_mongrel_ports}; do - pidfile="${puppetmaster_rundir}/mongrel.${port}.pid" - command_args="master --pidfile=${pidfile} --servertype=mongrel --masterport=${port}" - run_rc_command "$1" - _rc_restart_done="false" - done -fi diff --git a/sysutils/puppet5/pkg-descr b/sysutils/puppet5/pkg-descr deleted file mode 100644 index 9d40dc90e9cc..000000000000 --- a/sysutils/puppet5/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Puppet lets you centrally manage every important aspect of your system using -a cross-platform specification language that manages all the separate -elements normally aggregated in different files, like users, cron jobs, and -hosts, along with obviously discrete elements like packages, services, and -files. - -WWW: https://puppet.com/docs/puppet/latest/puppet_index.html diff --git a/sysutils/puppet5/pkg-plist b/sysutils/puppet5/pkg-plist deleted file mode 100644 index 9a94f5abf784..000000000000 --- a/sysutils/puppet5/pkg-plist +++ /dev/null @@ -1,45 +0,0 @@ -bin/puppet -%%ETCDIR%%/auth.conf-dist -%%ETCDIR%%/puppet.conf-dist -%%RUBY_SITELIBDIR%%/hiera/puppet_function.rb -%%RUBY_SITELIBDIR%%/hiera/scope.rb -%%RUBY_SITELIBDIR%%/hiera_puppet.rb -%%RUBY_SITELIBDIR%%/puppet_pal.rb -%%RUBY_SITELIBDIR%%/puppet_x.rb -man/man5/puppet.conf.5.gz -man/man8/puppet-agent.8.gz -man/man8/puppet-apply.8.gz -man/man8/puppet-ca.8.gz -man/man8/puppet-catalog.8.gz -man/man8/puppet-cert.8.gz -man/man8/puppet-certificate.8.gz -man/man8/puppet-certificate_request.8.gz -man/man8/puppet-certificate_revocation_list.8.gz -man/man8/puppet-config.8.gz -man/man8/puppet-describe.8.gz -man/man8/puppet-device.8.gz -man/man8/puppet-doc.8.gz -man/man8/puppet-epp.8.gz -man/man8/puppet-facts.8.gz -man/man8/puppet-filebucket.8.gz -man/man8/puppet-generate.8.gz -man/man8/puppet-help.8.gz -man/man8/puppet-key.8.gz -man/man8/puppet-lookup.8.gz -man/man8/puppet-man.8.gz -man/man8/puppet-master.8.gz -man/man8/puppet-module.8.gz -man/man8/puppet-node.8.gz -man/man8/puppet-parser.8.gz -man/man8/puppet-plugin.8.gz -man/man8/puppet-report.8.gz -man/man8/puppet-resource.8.gz -man/man8/puppet-script.8.gz -man/man8/puppet-status.8.gz -man/man8/puppet.8.gz -@(puppet,puppet,) %%WWWDIR%%/config.ru -@dir(puppet,puppet,) %%ETCDIR%%/manifests -@dir(puppet,puppet,) %%ETCDIR%%/modules -@dir(puppet,puppet,) /var/puppet -@dir(puppet,puppet,) /var/log/puppet -@dir /var/run/puppet diff --git a/sysutils/puppetserver5/Makefile b/sysutils/puppetserver5/Makefile deleted file mode 100644 index 3acb4197de28..000000000000 --- a/sysutils/puppetserver5/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -PORTNAME= puppetserver -PORTVERSION= 5.3.16 -CATEGORIES= sysutils java -MASTER_SITES= https://downloads.puppetlabs.com/puppet/ -PKGNAMESUFFIX= 5 - -MAINTAINER= puppet@FreeBSD.org -COMMENT= Puppet Server running in the JVM - -LICENSE= APACHE20 - -DEPRECATED= Puppet 5 has reached EOL -EXPIRATION_DATE=2021-07-01 -BROKEN_FreeBSD_12= Does not start. See PR 233766 -BROKEN_FreeBSD_13= Does not start. See PR 233766 - -RUN_DEPENDS= bash>=0:shells/bash \ - puppet5>=0:sysutils/puppet5 - -USES= shebangfix -USE_RC_SUBR= puppetserver - -USE_JAVA= yes -USE_RUBY= yes -NO_ARCH= yes -NO_BUILD= yes -JAVA_VERSION= 1.8+ - -CONFLICTS_INSTALL= puppetserver6-* puppetserver7-* - -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 - @${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 - -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 - ${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar - ${INSTALL_DATA} ${WRKSRC}/jruby-9k.jar ${STAGEDIR}${DATADIR}/jruby-9k.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/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 <bsd.port.mk> diff --git a/sysutils/puppetserver5/distinfo b/sysutils/puppetserver5/distinfo deleted file mode 100644 index b2202f9718b0..000000000000 --- a/sysutils/puppetserver5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1604551667 -SHA256 (puppetserver-5.3.16.tar.gz) = 8395938b4263c847e0935364b9da4e9ec40715dfdc529a80fca60b90b2df5337 -SIZE (puppetserver-5.3.16.tar.gz) = 53789542 diff --git a/sysutils/puppetserver5/files/patch-ext__bin__puppetserver b/sysutils/puppetserver5/files/patch-ext__bin__puppetserver deleted file mode 100644 index ebd032d71b1a..000000000000 --- a/sysutils/puppetserver5/files/patch-ext__bin__puppetserver +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/bin/puppetserver.orig 2018-09-28 11:06:23 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 -XX:MaxPermSize=256m" -+ 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/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh b/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh deleted file mode 100644 index 186416323709..000000000000 --- a/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/cli_defaults/cli-defaults.sh.orig 2018-08-21 16:07:05 UTC -+++ ext/cli_defaults/cli-defaults.sh -@@ -1,6 +1,6 @@ --INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver" -+INSTALL_DIR="%%DATADIR%%" - --JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-1_7.jar}" -+JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-9k.jar}" - - if [ ! -e "$JRUBY_JAR" ]; then - echo "Unable to find specified JRUBY_JAR: ${JRUBY_JAR}" 1>&2 diff --git a/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf b/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf deleted file mode 100644 index a3c0983b8850..000000000000 --- a/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf +++ /dev/null @@ -1,9 +0,0 @@ ---- ext/config/conf.d/global.conf.orig 2018-08-21 16:07:02 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/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf b/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf deleted file mode 100644 index a1f1fc0ce540..000000000000 --- a/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf +++ /dev/null @@ -1,56 +0,0 @@ ---- ext/config/conf.d/puppetserver.conf.orig 2020-07-02 18:59:15 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 -- ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby] -+ ruby-load-path: [ -+ %%RUBY_SITELIBDIR%%, -+ %%PREFIX%%/lib/ruby/vendor_ruby, -+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter/lib, -+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/hocon-1.3.1/lib, -+ ] - - # 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"] - - # PLEASE NOTE: Use caution when modifying the below settings. Modifying - # these settings will change the value of the corresponding Puppet settings -@@ -26,23 +31,23 @@ jruby-puppet: { - - # (optional) path to puppet conf dir; if not specified, will use - # /etc/puppetlabs/puppet -- master-conf-dir: /etc/puppetlabs/puppet -+ master-conf-dir: %%PREFIX%%/etc/puppet - - # (optional) path to puppet code dir; if not specified, will use - # /etc/puppetlabs/code -- master-code-dir: /etc/puppetlabs/code -+ master-code-dir: %%PREFIX%%/etc/puppet/code - - # (optional) path to puppet var dir; if not specified, will use - # /opt/puppetlabs/server/data/puppetserver -- master-var-dir: /opt/puppetlabs/server/data/puppetserver -+ master-var-dir: /var/puppet/server/data/puppetserver - - # (optional) path to puppet run dir; if not specified, will use - # /var/run/puppetlabs/puppetserver -- master-run-dir: /var/run/puppetlabs/puppetserver -+ master-run-dir: /var/run/puppetserver - - # (optional) path to puppet log dir; if not specified, will use - # /var/log/puppetlabs/puppetserver -- master-log-dir: /var/log/puppetlabs/puppetserver -+ master-log-dir: /var/log/puppetserver - - # (optional) maximum number of JRuby instances to allow - #max-active-instances: 1 diff --git a/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf b/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf deleted file mode 100644 index 6559e2f094c1..000000000000 --- a/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf +++ /dev/null @@ -1,9 +0,0 @@ ---- ext/config/conf.d/webserver.conf.orig 2018-08-21 16:07:02 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/puppetserver5/files/patch-ext__config__logback.xml b/sysutils/puppetserver5/files/patch-ext__config__logback.xml deleted file mode 100644 index 5e9bd158d834..000000000000 --- a/sysutils/puppetserver5/files/patch-ext__config__logback.xml +++ /dev/null @@ -1,17 +0,0 @@ ---- ext/config/logback.xml.orig 2018-08-21 16:07:02 UTC -+++ ext/config/logback.xml -@@ -6,12 +6,11 @@ - </appender> - - <appender name="F1" class="ch.qos.logback.core.rolling.RollingFileAppender"> -- <!-- TODO: this path should not be hard-coded --> -- <file>/var/log/puppetlabs/puppetserver/puppetserver.log</file> -+ <file>/var/log/puppetserver/puppetserver.log</file> - <append>true</append> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <!-- rollover daily --> -- <fileNamePattern>/var/log/puppetlabs/puppetserver/puppetserver-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> -+ <fileNamePattern>/var/log/puppetserver/puppetserver-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> - <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total--> - <maxFileSize>200MB</maxFileSize> - <maxHistory>90</maxHistory> diff --git a/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml b/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml deleted file mode 100644 index 5899320bc72d..000000000000 --- a/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/config/request-logging.xml.orig 2018-08-21 16:07:02 UTC -+++ ext/config/request-logging.xml -@@ -1,10 +1,10 @@ - <configuration debug="false" scan="true"> - <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> - <append>true</append> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <!-- rollover daily --> -- <fileNamePattern>/var/log/puppetlabs/puppetserver/puppetserver-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> -+ <fileNamePattern>/var/log/puppetserver/puppetserver-access-%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern> - <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total--> - <maxFileSize>200MB</maxFileSize> - <maxHistory>90</maxHistory> diff --git a/sysutils/puppetserver5/files/pkg-message.in b/sysutils/puppetserver5/files/pkg-message.in deleted file mode 100644 index 0635f9786fce..000000000000 --- a/sysutils/puppetserver5/files/pkg-message.in +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ type: install - message: <<EOM -Remember to run: - -sysrc puppetserver_enable=yes - -A note to users upgrading to 2.6 who have also modified bootstrap.cfg, please -see the release notes for breaking changes in 2.5. - -https://docs.puppet.com/puppetserver/latest/release_notes.html#puppet-server-25 - -The file bootstrap.cfg has been removed and ca configuration has been moved out -to its own file in ca.cfg. -EOM -} -] diff --git a/sysutils/puppetserver5/files/puppetserver.in b/sysutils/puppetserver5/files/puppetserver.in deleted file mode 100644 index 02887e6392e1..000000000000 --- a/sysutils/puppetserver5/files/puppetserver.in +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# PROVIDE: puppetserver -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Configuration settings for puppetserver in /etc/rc.conf: -# -# puppetserver_enable (bool): -# Set to "NO" by default. -# Set it to "YES" to enable puppetserver -# -# puppetserver_args (str): -# Extra arguments passed to start command -# -# puppetserver_java_home (str): -# Set to "%%JAVA_HOME%%" by default. -# Set the Java virtual machine to run puppetserver -# -# puppetserver_java_opts (str): -# Set to "" by default. -# Java VM args to use. -# -# puppetserver_user (str): -# Set to "puppet" by default. -# User to run puppetserver as. -# -# puppetserver_group (str): -# Set to "puppet" by default. -# Group for data file ownership. -# -# puppetserver_log_file (str): -# Set to "/var/log/puppetserver/puppetserver.log" by default. -# Log file location. -# - -. /etc/rc.subr - -name="puppetserver" -rcvar=puppetserver_enable - -load_rc_config "${name}" - -: ${puppetserver_enable="NO"} -: ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"} -: ${puppetserver_java_home="%%JAVA_HOME%%"} -: ${puppetserver_java_opts=""} -: ${puppetserver_user="puppet"} -: ${puppetserver_group="puppet"} -: ${puppetserver_log_file="/var/log/puppetserver/puppetserver.log"} - -pidfile="/var/run/puppetserver/puppetserver.pid" -command="/usr/sbin/daemon" -java_cmd="${puppetserver_java_home}/bin/java" -procname="${java_cmd}" -command_args="-f -p ${pidfile} ${java_cmd} ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}" - - -required_files="${java_cmd}" - -start_precmd="puppetserver_prestart" - -# An UTF-8 locale is required -: LC_ALL=${LC_ALL:=C.UTF-8} -case $LC_ALL in - *.UTF-8) - ;; - *.*) - LC_ALL="${LC_ALL%.*}.UTF-8" - ;; - *) - LC_ALL=C.UTF-8 - ;; -esac -export LC_ALL - -puppetserver_prestart() { - if [ ! -f "${puppetserver_log_file}" ]; then - touch "${puppetserver_log_file}" - chown "${puppetserver_user}:${puppetserver_group}" "${puppetserver_log_file}" - chmod 640 "${puppetserver_log_file}" - fi - if [ ! -d "/var/run/puppetserver" ]; then - install -d -o "${puppetserver_user}" -g "${puppetserver_group}" -m 750 "/var/run/puppetserver" - fi - - chown -R "root:${puppetserver_group}" "%%PREFIX%%/etc/puppetserver/conf.d" - chmod 0750 "%%PREFIX%%/etc/puppetserver/conf.d" - - chown "root:${puppetserver_group}" "%%PREFIX%%/etc/puppetserver/logback.xml" - chmod 0640 "%%PREFIX%%/etc/puppetserver/logback.xml" -} - -run_rc_command "$1" diff --git a/sysutils/puppetserver5/pkg-descr b/sysutils/puppetserver5/pkg-descr deleted file mode 100644 index 99ba4db5203a..000000000000 --- a/sysutils/puppetserver5/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -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. - -WWW: https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserver.html diff --git a/sysutils/puppetserver5/pkg-plist b/sysutils/puppetserver5/pkg-plist deleted file mode 100644 index 0a8b5bd45059..000000000000 --- a/sysutils/puppetserver5/pkg-plist +++ /dev/null @@ -1,26 +0,0 @@ -@(,,750) bin/puppetserver -@sample %%ETCDIR%%/logback.xml.sample -@sample %%ETCDIR%%/request-logging.xml.sample -@sample %%ETCDIR%%/conf.d/auth.conf.sample -@sample %%ETCDIR%%/conf.d/global.conf.sample -@sample %%ETCDIR%%/conf.d/metrics.conf.sample -@sample %%ETCDIR%%/conf.d/puppetserver.conf.sample -@sample %%ETCDIR%%/conf.d/web-routes.conf.sample -@sample %%ETCDIR%%/conf.d/webserver.conf.sample -@sample %%ETCDIR%%/services.d/bootstrap.cfg.sample -@sample %%ETCDIR%%/services.d/ca.cfg.sample -@dir(,puppet,750) etc/puppet/code -%%DATADIR%%/puppet-server-release.jar -%%DATADIR%%/jruby-9k.jar -@(,,755) %%DATADIR%%/cli/apps/start -@(,,755) %%DATADIR%%/cli/apps/stop -@(,,755) %%DATADIR%%/cli/apps/reload -@(,,755) %%DATADIR%%/cli/apps/foreground -@(,,755) %%DATADIR%%/cli/apps/gem -@(,,755) %%DATADIR%%/cli/apps/irb -@(,,755) %%DATADIR%%/cli/apps/ruby -@(,,755) %%DATADIR%%/cli/cli-defaults.sh -@(,,755) %%DATADIR%%/ezbake-functions.sh -@dir(puppet,puppet,750) /var/log/puppetserver -@dir(puppet,puppet,755) /var/puppet -@dir(puppet,puppet,750) /var/puppet/server |