From ecdd183816cd489a22339c8e622ca20f4778e046 Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Feb 14 2025 17:31:39 +0000 Subject: Update to 8.6.0 Related-to: https://review.rdoproject.org/r/q/I0ddb450498833693a8c7da8b579d21b864f51a34 --- diff --git a/.puppet.metadata b/.puppet.metadata index 4c24d55..2323a0f 100644 --- a/.puppet.metadata +++ b/.puppet.metadata @@ -1,4 +1,5 @@ 679edace7c4b45a79a8f086685ac5e6b2d0b8151 SOURCES/puppet-8.6.0.tar.gz +280b526f1e4d86a28084964a80a55d43713873ff SOURCES/puppet-8.6.0.tar.gz.asc a4770120e582769dbec805147531d57aa1c00261 SOURCES/puppetlabs-augeas_core-1.4.0.tar.gz 2d1c5f0384c17646f4df16f4fca40ff5b869b26f SOURCES/puppetlabs-cron_core-1.2.1.tar.gz 18c53785f41e99d67110294019f71fe84f4b8d45 SOURCES/puppetlabs-host_core-1.2.0.tar.gz diff --git a/SOURCES/0001-Adapt-path-for-vendored-modules-according-to-Fedora-.patch b/SOURCES/0001-Adapt-path-for-vendored-modules-according-to-Fedora-.patch new file mode 100644 index 0000000..81b4ff8 --- /dev/null +++ b/SOURCES/0001-Adapt-path-for-vendored-modules-according-to-Fedora-.patch @@ -0,0 +1,25 @@ +From adee1aa6df15d42b86109ba892ca002d7e8130bd Mon Sep 17 00:00:00 2001 +From: Alfredo Moralejo +Date: Mon, 15 Jul 2019 18:14:36 +0200 +Subject: [PATCH] Adapt path for vendored modules according to Fedora standards + +--- + lib/puppet/defaults.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb +index 54ed58b75d..7a7bf86299 100644 +--- a/lib/puppet/defaults.rb ++++ b/lib/puppet/defaults.rb +@@ -54,7 +54,7 @@ module Puppet + nil + end + else +- '/opt/puppetlabs/puppet/vendor_modules' ++ '/usr/share/ruby/vendor_ruby/puppet/vendor_modules' + end + end + +-- +2.20.1 + diff --git a/SOURCES/0001-Fix-puppet-paths.patch b/SOURCES/0001-Fix-puppet-paths.patch new file mode 100644 index 0000000..78fd66e --- /dev/null +++ b/SOURCES/0001-Fix-puppet-paths.patch @@ -0,0 +1,49 @@ +From e6d4f123893c27a3d8a6aac7b26853023433166e Mon Sep 17 00:00:00 2001 +From: Yatin Karel +Date: Fri, 14 May 2021 08:21:46 +0000 +Subject: [PATCH] Fix puppet paths + +--- + lib/puppet/util/run_mode.rb | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb +index 36f38ddb0d..314bf1bd15 100644 +--- a/lib/puppet/util/run_mode.rb ++++ b/lib/puppet/util/run_mode.rb +@@ -63,27 +63,27 @@ module Puppet + + class UnixRunMode < RunMode + def conf_dir +- which_dir("/etc/puppetlabs/puppet", "~/.puppetlabs/etc/puppet") ++ which_dir("/etc/puppet", "~/.puppet") + end + + def code_dir +- which_dir("/etc/puppetlabs/code", "~/.puppetlabs/etc/code") ++ which_dir("/etc/puppet", "~/.puppet/code") + end + + def var_dir +- which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache") ++ which_dir("/var/lib/puppet", "~/.puppet/cache") + end + + def public_dir +- which_dir("/opt/puppetlabs/puppet/public", "~/.puppetlabs/opt/puppet/public") ++ which_dir("/var/lib/puppet", "~/.puppet/public") + end + + def run_dir +- which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run") ++ which_dir("/var/run/puppet", "~/.puppet/var/run") + end + + def log_dir +- which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log") ++ which_dir("/var/log/puppet", "~/.puppet/var/log") + end + end + +-- +2.27.0 diff --git a/SOURCES/0002-Revert-maint-Remove-puppetmaster.service.patch b/SOURCES/0002-Revert-maint-Remove-puppetmaster.service.patch new file mode 100644 index 0000000..8e82f5f --- /dev/null +++ b/SOURCES/0002-Revert-maint-Remove-puppetmaster.service.patch @@ -0,0 +1,47 @@ +From f54a22b96e9e631991bad095a7b321273a2e6e3f Mon Sep 17 00:00:00 2001 +From: Gael Chamoulaud +Date: Wed, 29 Jul 2015 21:58:48 +0200 +Subject: [PATCH 2/5] Revert "(maint) Remove puppetmaster.service" + +This reverts commit c0e30daa53b6267c1c86b6e27c01b1c26cf49af5. +--- + ext/systemd/puppet.service | 2 +- + ext/systemd/puppetmaster.service | 12 ++++++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + create mode 100644 ext/systemd/puppetmaster.service + +diff --git a/ext/systemd/puppet.service b/ext/systemd/puppet.service +index 7c16615..36769ac 100644 +--- a/ext/systemd/puppet.service ++++ b/ext/systemd/puppet.service +@@ -12,7 +12,7 @@ + [Unit] + Description=Puppet agent + Documentation=man:puppet-agent(8) + Wants=basic.target +-After=basic.target network.target network-online.target ++After=basic.target network.target network-online.target puppetmaster.service + + [Service] + EnvironmentFile=-/etc/sysconfig/puppetagent +diff --git a/ext/systemd/puppetmaster.service b/ext/systemd/puppetmaster.service +new file mode 100644 +index 0000000..dbbd627 +--- /dev/null ++++ b/ext/systemd/puppetmaster.service +@@ -0,0 +1,12 @@ ++[Unit] ++Description=Puppet master ++Wants=basic.target ++After=basic.target network.target ++ ++[Service] ++EnvironmentFile=-/etc/sysconfig/puppetmaster ++EnvironmentFile=-/etc/default/puppetmaster ++ExecStart=/usr/bin/puppet master $PUPPETMASTER_EXTRA_OPTS --no-daemonize ++ ++[Install] ++WantedBy=multi-user.target +-- +2.19.2 + diff --git a/SOURCES/puppet-nm-dispatcher b/SOURCES/puppet-nm-dispatcher new file mode 100644 index 0000000..6e9e0b3 --- /dev/null +++ b/SOURCES/puppet-nm-dispatcher @@ -0,0 +1,8 @@ +#!/bin/bash +# +# Restart puppet on network changes to pickup changes to /etc/resolv.conf +# +# https://projects.puppetlabs.com/issues/2776 +# https://bugzilla.redhat.com/532085 + +[[ $2 =~ ^(up|down)$ ]] && /sbin/service puppet condrestart || :