diff options
Diffstat (limited to 'sysutils/puppetserver7/files')
11 files changed, 0 insertions, 288 deletions
diff --git a/sysutils/puppetserver7/files/patch-ext__bin__puppetserver b/sysutils/puppetserver7/files/patch-ext__bin__puppetserver deleted file mode 100644 index fb17e51c6fde..000000000000 --- a/sysutils/puppetserver7/files/patch-ext__bin__puppetserver +++ /dev/null @@ -1,15 +0,0 @@ ---- 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/puppetserver7/files/patch-ext__cli__foreground b/sysutils/puppetserver7/files/patch-ext__cli__foreground deleted file mode 100644 index a4a4a5ad6649..000000000000 --- a/sysutils/puppetserver7/files/patch-ext__cli__foreground +++ /dev/null @@ -1,19 +0,0 @@ ---- 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/puppetserver7/files/patch-ext__cli_defaults__cli-defaults.sh b/sysutils/puppetserver7/files/patch-ext__cli_defaults__cli-defaults.sh deleted file mode 100644 index 85febc64943c..000000000000 --- a/sysutils/puppetserver7/files/patch-ext__cli_defaults__cli-defaults.sh +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/puppetserver7/files/patch-ext__config__conf.d__global.conf b/sysutils/puppetserver7/files/patch-ext__config__conf.d__global.conf deleted file mode 100644 index 5fc83d8e0ae8..000000000000 --- a/sysutils/puppetserver7/files/patch-ext__config__conf.d__global.conf +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf b/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf deleted file mode 100644 index 335690c0d1cb..000000000000 --- a/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf +++ /dev/null @@ -1,55 +0,0 @@ ---- 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/puppetserver7/files/patch-ext__config__conf.d__webserver.conf b/sysutils/puppetserver7/files/patch-ext__config__conf.d__webserver.conf deleted file mode 100644 index 21e4c5e6d868..000000000000 --- a/sysutils/puppetserver7/files/patch-ext__config__conf.d__webserver.conf +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/puppetserver7/files/patch-ext__config__logback.xml b/sysutils/puppetserver7/files/patch-ext__config__logback.xml deleted file mode 100644 index 74a9d061510f..000000000000 --- a/sysutils/puppetserver7/files/patch-ext__config__logback.xml +++ /dev/null @@ -1,31 +0,0 @@ ---- ext/config/logback.xml.orig 2023-10-19 16:07:56 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> -@@ -23,11 +22,11 @@ - </appender> - - <appender name="STATUS" class="ch.qos.logback.core.rolling.RollingFileAppender"> -- <file>/var/log/puppetlabs/puppetserver/puppetserver-status.log</file> -+ <file>/var/log/puppetserver/puppetserver-status.log</file> - <append>true</append> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <!-- rollover daily --> -- <fileNamePattern>/var/log/puppetlabs/puppetserver/puppetserver-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> -+ <fileNamePattern>/var/log/puppetserver/puppetserver-status-%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/puppetserver7/files/patch-ext__config__request-logging.xml b/sysutils/puppetserver7/files/patch-ext__config__request-logging.xml deleted file mode 100644 index 4358008fdb47..000000000000 --- a/sysutils/puppetserver7/files/patch-ext__config__request-logging.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- 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"> - <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/puppetserver7/files/patch-ext__ezbake-functions.sh b/sysutils/puppetserver7/files/patch-ext__ezbake-functions.sh deleted file mode 100644 index bd4d0a1c26b7..000000000000 --- a/sysutils/puppetserver7/files/patch-ext__ezbake-functions.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/puppetserver7/files/pkg-message.in b/sysutils/puppetserver7/files/pkg-message.in deleted file mode 100644 index 0635f9786fce..000000000000 --- a/sysutils/puppetserver7/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/puppetserver7/files/puppetserver.in b/sysutils/puppetserver7/files/puppetserver.in deleted file mode 100644 index 65ab0c6714ac..000000000000 --- a/sysutils/puppetserver7/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} -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger -Dlogappender=F1 ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar:%%PREFIX%%/lib/ruby/vendor_ruby/facter.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" |