Sisyphus repositório
Última atualização: 1 outubro 2023 | SRPMs: 18631 | Visitas: 37838091
en ru br
ALT Linux repositórios
S:6.20.0-alt1

Group :: Other
RPM: puppetserver

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs e FR  Repocop 

Patch: puppetserver-6.13.0-alt.patch
Download

diff --git a/puppetserver/controller.sh b/puppetserver/controller.sh
index 4f9f9cdf..e623e4c8 100644
--- a/puppetserver/controller.sh
+++ b/puppetserver/controller.sh
@@ -122,8 +122,6 @@ params+=('--description' "$(printf "Puppet Labs puppetserver\nContains: Puppet S
 
 
 
-params+=('--create-dir' '/opt/puppetlabs/server/data/puppetserver/jars')
-
 
 
 if [[ "$os" = 'el' || "$os" = 'sles' || "$os" = 'fedora' || "$os" = 'redhatfips' ]]; then
diff --git a/puppetserver/ext/bin/puppetserver b/puppetserver/ext/bin/puppetserver
index 27efb85d..f9acce5d 100644
--- a/puppetserver/ext/bin/puppetserver
+++ b/puppetserver/ext/bin/puppetserver
@@ -4,10 +4,11 @@
 umask 027
 
 set -a
+SYSCONFIGCFG="/etc/sysconfig/puppetserver"
 if [ -r "/etc/default/puppetserver" ] ; then
     . /etc/default/puppetserver
-elif [ -r "/etc/sysconfig/puppetserver" ] ; then
-    . /etc/sysconfig/puppetserver
+elif [ -r "$SYSCONFIGCFG" ] ; then
+    . "$SYSCONFIGCFG"
 elif [ `uname` == "OpenBSD" ] ; then
     JAVA_BIN=$(javaPathHelper -c puppetserver)
     JAVA_ARGS="-Xms2g -Xmx2g -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger"
diff --git a/puppetserver/ext/cli/ca b/puppetserver/ext/cli/ca
index c1be3d9f..a7d1e989 100644
--- a/puppetserver/ext/cli/ca
+++ b/puppetserver/ext/cli/ca
@@ -1,4 +1,4 @@
-#!/opt/puppetlabs/puppet/bin/ruby
+#!/usr/bin/ruby
 
 require 'puppetserver/ca/cli'
 
diff --git a/puppetserver/ext/cli/foreground b/puppetserver/ext/cli/foreground
index e0eca9fd..c7b54bf4 100644
--- a/puppetserver/ext/cli/foreground
+++ b/puppetserver/ext/cli/foreground
@@ -1,6 +1,16 @@
 #!/usr/bin/env bash
 
-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter"
+SYSCONFIGCFG="/etc/sysconfig/puppetserver"
+if [ -r "/etc/default/puppetserver" ] ; then
+    . /etc/default/puppetserver
+elif [ -r "$SYSCONFIGCFG" ] ; then
+    . "$SYSCONFIGCFG"
+else
+    echo "You seem to be missing some important configuration files; could not find /etc/default/puppetserver or /etc/sysconfig/puppetserver" >&2
+    exit 1
+fi
+
+restartfile="/var/lib/puppetserver/restartcounter"
 cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh
 
 if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then
diff --git a/puppetserver/ext/cli/reload b/puppetserver/ext/cli/reload
index 757f3e57..cda6bedc 100644
--- a/puppetserver/ext/cli/reload
+++ b/puppetserver/ext/cli/reload
@@ -1,11 +1,21 @@
 #!/usr/bin/env bash
 set +e
 
-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter"
+SYSCONFIGCFG="/etc/sysconfig/puppetserver"
+if [ -r "/etc/default/puppetserver" ] ; then
+    . /etc/default/puppetserver
+elif [ -r "$SYSCONFIGCFG" ] ; then
+    . "$SYSCONFIGCFG"
+else
+    echo "You seem to be missing some important configuration files; could not find /etc/default/puppetserver or /etc/sysconfig/puppetserver" >&2
+    exit 1
+fi
+
+restartfile="/var/lib/puppetserver/restartcounter"
 reload_timeout="${RELOAD_TIMEOUT:-120}"
 timeout="$reload_timeout"
 realname="puppetserver"
-PIDFILE="/var/run/puppetlabs/${realname}/${realname}.pid"
+PIDFILE="/var/run/${realname}/${realname}.pid"
 
 if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then
     echo "Unable to find ${INSTALL_DIR}/ezbake-functions.sh script, failing start." 1>&2
diff --git a/puppetserver/ext/cli/start b/puppetserver/ext/cli/start
index e4271294..8cf3e375 100644
--- a/puppetserver/ext/cli/start
+++ b/puppetserver/ext/cli/start
@@ -1,14 +1,24 @@
 #!/usr/bin/env bash
 set +e
 
+SYSCONFIGCFG="/etc/sysconfig/puppetserver"
+if [ -r "/etc/default/puppetserver" ] ; then
+    . /etc/default/puppetserver
+elif [ -r "$SYSCONFIGCFG" ] ; then
+    . "$SYSCONFIGCFG"
+else
+    echo "You seem to be missing some important configuration files; could not find /etc/default/puppetserver or /etc/sysconfig/puppetserver" >&2
+    exit 1
+fi
+
 pid="$(pgrep -f "puppet-server-release.jar.* -m puppetlabs.trapperkeeper.main")"
 
-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter"
+restartfile="/var/run/puppetserver/restartcounter"
 start_timeout="${START_TIMEOUT:-300}"
 
 real_name="puppetserver"
-rundir="/var/run/puppetlabs/${real_name}"
-app_logdir=${app_logdir:=/var/log/puppetlabs/${real_name}}
+rundir="/var/run/${real_name}"
+app_logdir=${app_logdir:=/var/log/${real_name}}
 PIDFILE="${rundir}/${real_name}.pid"
 
 cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh
diff --git a/puppetserver/ext/cli_defaults/cli-defaults.sh b/puppetserver/ext/cli_defaults/cli-defaults.sh
index 4c89c6b9..16ab6948 100644
--- a/puppetserver/ext/cli_defaults/cli-defaults.sh
+++ b/puppetserver/ext/cli_defaults/cli-defaults.sh
@@ -1,7 +1,7 @@
-INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
+INSTALL_DIR="/usr/share/puppetserver"
 
 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/lib/ruby/vendor_ruby/facter.jar:/var/lib/puppetserver/jars/*"
diff --git a/puppetserver/ext/config/conf.d/global.conf b/puppetserver/ext/config/conf.d/global.conf
index ed76c439..ef92defa 100644
--- a/puppetserver/ext/config/conf.d/global.conf
+++ b/puppetserver/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: /etc/puppetserver/logback.xml
 }
diff --git a/puppetserver/ext/config/conf.d/puppetserver.conf b/puppetserver/ext/config/conf.d/puppetserver.conf
index 72533389..3f56b4a0 100644
--- a/puppetserver/ext/config/conf.d/puppetserver.conf
+++ b/puppetserver/ext/config/conf.d/puppetserver.conf
@@ -2,16 +2,16 @@
 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: [/usr/lib/ruby/site_ruby, /usr/lib/ruby/gems/2.5.0/gems/puppet-6.8.0/lib/, /usr/lib/ruby/gems/2.5.0/gems/facter-2.5.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: /usr/lib/ruby/gems/2.5.0
 
     # 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}, /usr/lib/ruby/gems/2.5.0]
 
     # PLEASE NOTE: Use caution when modifying the below settings. Modifying
     # these settings will change the value of the corresponding Puppet settings
@@ -26,23 +26,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: /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: /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/lib/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/puppetserver/ext/default b/puppetserver/ext/default
index dc78c980..775c731a 100644
--- a/puppetserver/ext/default
+++ b/puppetserver/ext/default
@@ -17,11 +17,11 @@ TK_ARGS=""
 # These normally shouldn't need to be edited if using OS packages
 USER="puppet"
 GROUP="puppet"
-INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
-CONFIG="/etc/puppetlabs/puppetserver/conf.d"
+INSTALL_DIR="/usr/share/puppetserver"
+CONFIG="/etc/puppetserver/conf.d"
 
 # Bootstrap path
-BOOTSTRAP_CONFIG="/etc/puppetlabs/puppetserver/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"
+BOOTSTRAP_CONFIG="/etc/puppetserver/,/etc/puppetserver/services.d/"
 
 # SERVICE_STOP_RETRIES can be set here to alter the default stop timeout in
 # seconds.  For systemd, the shorter of this setting or 'TimeoutStopSec' in
diff --git a/puppetserver/ext/fpm.rb b/puppetserver/ext/fpm.rb
index 7dc5faff..6b8d5e59 100644
--- a/puppetserver/ext/fpm.rb
+++ b/puppetserver/ext/fpm.rb
@@ -157,10 +157,10 @@ fpm_opts = Array('')
 shared_opts = Array('')
 termini_opts = Array('')
 
-options.app_logdir = "/var/log/puppetlabs/#{options.realname}"
-options.app_rundir = "/var/run/puppetlabs/#{options.realname}"
-options.app_prefix = "/opt/puppetlabs/server/apps/#{options.realname}"
-options.app_data = "/opt/puppetlabs/server/data/#{options.realname}"
+options.app_logdir = "/var/log/#{options.realname}"
+options.app_rundir = "/var/run/#{options.realname}"
+options.app_prefix = "/usr/share/#{options.realname}"
+options.app_data = "/var/lib/#{options.realname}"
 
 # rpm specific options
 if options.output_type == 'rpm'
@@ -220,7 +220,7 @@ if options.output_type == 'rpm'
     fpm_opts << "--rpm-tag '%{?systemd_requires}'"
   end
 
-  fpm_opts << "--config-files /etc/puppetlabs/#{options.realname}"
+  fpm_opts << "--config-files /etc/#{options.realname}"
   fpm_opts << "--config-files /etc/sysconfig/#{options.name}"
 
   options.additional_dirs.each do |dir|
@@ -237,16 +237,11 @@ if options.output_type == 'rpm'
   end
 
   fpm_opts << "--directories #{options.app_logdir}"
-  fpm_opts << "--directories /etc/puppetlabs/#{options.realname}"
+  fpm_opts << "--directories /etc/#{options.realname}"
   fpm_opts << "--directories #{options.app_rundir}"
   shared_opts << "--rpm-auto-add-directories"
-  fpm_opts << "--rpm-auto-add-exclude-directories /etc/puppetlabs"
-  shared_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs"
-  fpm_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/bin"
-  fpm_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/server"
-  fpm_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/server/apps"
-  fpm_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/server/bin"
-  fpm_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/server/data"
+  fpm_opts << "--rpm-auto-add-exclude-directories /etc/puppetserver"
+  shared_opts << "--rpm-auto-add-exclude-directories /etc/puppetserver"
   fpm_opts << "--rpm-auto-add-exclude-directories /usr/lib/systemd"
   fpm_opts << "--rpm-auto-add-exclude-directories /usr/lib/systemd/system"
   fpm_opts << "--rpm-auto-add-exclude-directories /etc/init.d"
@@ -254,24 +249,22 @@ if options.output_type == 'rpm'
   fpm_opts << "--rpm-auto-add-exclude-directories /etc/logrotate.d"
   fpm_opts << "--rpm-auto-add-exclude-directories /etc/rc.d/init.d"
   fpm_opts << "--rpm-auto-add-exclude-directories /usr/lib/tmpfiles.d"
-  fpm_opts << "--rpm-auto-add-exclude-directories /var/log/puppetlabs"
-  fpm_opts << "--rpm-auto-add-exclude-directories /var/run/puppetlabs"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/face"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/face/node"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/functions"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/indirector"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/indirector/catalog"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/indirector/facts"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/indirector/node"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/indirector/resource"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/reports"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/util"
-  termini_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/util/puppetdb"
+  fpm_opts << "--rpm-auto-add-exclude-directories /var/log/puppetserver"
+  fpm_opts << "--rpm-auto-add-exclude-directories /var/run/puppetserver"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/face"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/face/node"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/functions"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/indirector"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/indirector/catalog"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/indirector/facts"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/indirector/node"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/indirector/resource"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/reports"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/util"
+  termini_opts << "--rpm-auto-add-exclude-directories /usr/lib/ruby/vendor_ruby/puppet/util/puppetdb"
   fpm_opts << "--rpm-attr 750,#{options.user},#{options.group}:/etc/puppetlabs/#{options.realname}"
   fpm_opts << "--rpm-attr 700,#{options.user},#{options.group}:#{options.app_logdir}"
   fpm_opts << "--rpm-attr -,#{options.user},#{options.group}:#{options.app_data}"
diff --git a/puppetserver/ext/puppetserver.logrotate.conf b/puppetserver/ext/puppetserver.logrotate.conf
index 6d9bce3e..94f73d9e 100644
--- a/puppetserver/ext/puppetserver.logrotate.conf
+++ b/puppetserver/ext/puppetserver.logrotate.conf
@@ -1,4 +1,4 @@
-/var/log/puppetlabs/puppetserver/*.log {
+/var/log/puppetserver/*.log {
     weekly
     missingok
     rotate 12
diff --git a/puppetserver/ext/puppetserver.tmpfiles.conf b/puppetserver/ext/puppetserver.tmpfiles.conf
index 23c81749..456ac4f4 100644
--- a/puppetserver/ext/puppetserver.tmpfiles.conf
+++ b/puppetserver/ext/puppetserver.tmpfiles.conf
@@ -1 +1 @@
-d /var/run/puppetlabs/puppetserver 0755 puppet puppet -
+d /var/run/puppetserver 0755 puppet puppet -
diff --git a/puppetserver/ext/redhat/puppetserver.service b/puppetserver/ext/redhat/puppetserver.service
index cc1d4757..650cced9 100644
--- a/puppetserver/ext/redhat/puppetserver.service
+++ b/puppetserver/ext/redhat/puppetserver.service
@@ -10,17 +10,17 @@
 #
 [Unit]
 Description=puppetserver Service
-After=syslog.target network.target nss-lookup.target 
+After=syslog.target network.target network-online.target
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/puppetserver
+EnvironmentFile=/etc/default/puppetserver
 User=puppet
 TimeoutStartSec=300
 TimeoutStopSec=60
 Restart=on-failure
 StartLimitBurst=5
-PIDFile=/var/run/puppetlabs/puppetserver/puppetserver.pid
+PIDFile=/var/run/puppetserver/puppetserver.pid
 
 # https://tickets.puppetlabs.com/browse/EZ-129
 # Prior to systemd v228, TasksMax was unset by default, and unlimited. Starting in 228 a default of '512'
@@ -34,9 +34,9 @@ TasksMax=4915
 UMask=027
 
 
-ExecReload=/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver reload
-ExecStart=/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver start
-ExecStop=/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver stop
+ExecReload=/usr/bin/puppetserver reload
+ExecStart=/usr/bin/puppetserver start
+ExecStop=/usr/bin/puppetserver stop
 
 KillMode=process
 
projeto & código: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
mantenedor atual: Michael Shigorin
mantenedor da tradução: Fernando Martini aka fmartini © 2009