From 49bf5bb2f3559fbfa85fb5dcdae7fc685f582bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Fri, 23 May 2025 15:11:34 -1000 Subject: sysutils/openvox-server8: New port Copied from sysutils/puppetserver8 With hat: puppet --- .../files/patch-ext__bin__puppetserver | 15 ++++ .../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 | 31 +++++++ .../files/patch-ext__config__request-logging.xml | 15 ++++ .../files/patch-ext__ezbake-functions.sh | 11 +++ sysutils/openvox-server8/files/pkg-message.in | 17 ++++ sysutils/openvox-server8/files/puppetserver.in | 95 ++++++++++++++++++++++ 11 files changed, 288 insertions(+) create mode 100644 sysutils/openvox-server8/files/patch-ext__bin__puppetserver create mode 100644 sysutils/openvox-server8/files/patch-ext__cli__foreground create mode 100644 sysutils/openvox-server8/files/patch-ext__cli_defaults__cli-defaults.sh create mode 100644 sysutils/openvox-server8/files/patch-ext__config__conf.d__global.conf create mode 100644 sysutils/openvox-server8/files/patch-ext__config__conf.d__puppetserver.conf create mode 100644 sysutils/openvox-server8/files/patch-ext__config__conf.d__webserver.conf create mode 100644 sysutils/openvox-server8/files/patch-ext__config__logback.xml create mode 100644 sysutils/openvox-server8/files/patch-ext__config__request-logging.xml create mode 100644 sysutils/openvox-server8/files/patch-ext__ezbake-functions.sh create mode 100644 sysutils/openvox-server8/files/pkg-message.in create mode 100644 sysutils/openvox-server8/files/puppetserver.in (limited to 'sysutils/openvox-server8/files') diff --git a/sysutils/openvox-server8/files/patch-ext__bin__puppetserver b/sysutils/openvox-server8/files/patch-ext__bin__puppetserver new file mode 100644 index 000000000000..fb17e51c6fde --- /dev/null +++ b/sysutils/openvox-server8/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/openvox-server8/files/patch-ext__cli__foreground b/sysutils/openvox-server8/files/patch-ext__cli__foreground new file mode 100644 index 000000000000..a4a4a5ad6649 --- /dev/null +++ b/sysutils/openvox-server8/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/openvox-server8/files/patch-ext__cli_defaults__cli-defaults.sh b/sysutils/openvox-server8/files/patch-ext__cli_defaults__cli-defaults.sh new file mode 100644 index 000000000000..85febc64943c --- /dev/null +++ b/sysutils/openvox-server8/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/openvox-server8/files/patch-ext__config__conf.d__global.conf b/sysutils/openvox-server8/files/patch-ext__config__conf.d__global.conf new file mode 100644 index 000000000000..5fc83d8e0ae8 --- /dev/null +++ b/sysutils/openvox-server8/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/openvox-server8/files/patch-ext__config__conf.d__puppetserver.conf b/sysutils/openvox-server8/files/patch-ext__config__conf.d__puppetserver.conf new file mode 100644 index 000000000000..335690c0d1cb --- /dev/null +++ b/sysutils/openvox-server8/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/openvox-server8/files/patch-ext__config__conf.d__webserver.conf b/sysutils/openvox-server8/files/patch-ext__config__conf.d__webserver.conf new file mode 100644 index 000000000000..21e4c5e6d868 --- /dev/null +++ b/sysutils/openvox-server8/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/openvox-server8/files/patch-ext__config__logback.xml b/sysutils/openvox-server8/files/patch-ext__config__logback.xml new file mode 100644 index 000000000000..22a49dbcde46 --- /dev/null +++ b/sysutils/openvox-server8/files/patch-ext__config__logback.xml @@ -0,0 +1,31 @@ +--- ext/config/logback.xml.orig 2023-10-19 16:09:06 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 +@@ -23,11 +22,11 @@ + + + +- /var/log/puppetlabs/puppetserver/puppetserver-status.log ++ /var/log/puppetserver/puppetserver-status.log + true + + +- /var/log/puppetlabs/puppetserver/puppetserver-status-%d{yyyy-MM-dd}.%i.log.gz ++ /var/log/puppetserver/puppetserver-status-%d{yyyy-MM-dd}.%i.log.gz + + 200MB + 90 diff --git a/sysutils/openvox-server8/files/patch-ext__config__request-logging.xml b/sysutils/openvox-server8/files/patch-ext__config__request-logging.xml new file mode 100644 index 000000000000..4358008fdb47 --- /dev/null +++ b/sysutils/openvox-server8/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/openvox-server8/files/patch-ext__ezbake-functions.sh b/sysutils/openvox-server8/files/patch-ext__ezbake-functions.sh new file mode 100644 index 000000000000..bd4d0a1c26b7 --- /dev/null +++ b/sysutils/openvox-server8/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/openvox-server8/files/pkg-message.in b/sysutils/openvox-server8/files/pkg-message.in new file mode 100644 index 000000000000..0635f9786fce --- /dev/null +++ b/sysutils/openvox-server8/files/pkg-message.in @@ -0,0 +1,17 @@ +[ +{ type: install + message: <