puppet 6.25.1-universal-darwin → 7.0.0-universal-darwin

data/ext/logcheck/puppet

@@ -0,0 +1,23 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: (Handled resources in|Resource comparison took|Searched for (host|resources|resource params and tags) in) [0-9.]+ seconds
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Starting Puppet server version [.0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in environment [_[:alnum:]]+ in [.[:digit:]]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Caught TERM; shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Starting Puppet client version [.0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: getting config$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Caching configuration at [\/._[:alnum:]-]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Loaded state in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Calling puppetmaster.getconfig$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Retrieved configuration in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Starting configuration run$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Finished configuration run in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Caught (TERM|INT); shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Restarting with .*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Starting catalog run$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Finished catalog run in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Loading fact .*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Ignoring cache$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Ignoring --listen on onetime run$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Retrieving plugins$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Reopening log files$

data/{examples → ext}/nagios/check_puppet.rb

@@ -11,8 +11,8 @@ class CheckPuppet
 
   # default options
   OPTIONS = {
-    :statefile => "/opt/puppetlabs/puppet/cache/state/state.yaml",
-    :process   => "puppet",
+    :statefile => "/var/lib/puppet/state/state.yaml",
+    :process   => "puppetd",
     :interval  => 30,
   }
 

data/ext/osx/file_mapping.yaml

@@ -0,0 +1,28 @@
+directories:
+  lib:
+    path: 'Library/Ruby/Site'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+  bin:
+    path: 'usr/bin'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0755'
+  'man/man8':
+    path: 'usr/share/man/man8'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0755'
+files:
+  'man/man5/puppet.conf.5':
+    path: 'usr/share/man/man5'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+  '[A-Z]*':
+    path: 'usr/share/doc/puppet'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+

data/ext/osx/postflight.erb

@@ -0,0 +1,109 @@
+#!/bin/bash
+
+#by doing the below, we are ensuring we are modifying the target system the package is being installed on,
+#not the OS running the installer
+declare -x dest_vol="${3}"
+declare -x dscl="${dest_vol}/usr/bin/dscl"
+declare -x dspath="${dest_vol}/var/db/dslocal/nodes/Default/"
+declare -x scripts_dir="${1}/Contents/Resources/"
+declare -x awk="/usr/bin/awk"
+declare -x last_user_id='-1'
+declare -x last_group_id='-1'
+
+function idFree() {
+  declare -a idArray=("${!2}")
+  for inc in ${idArray[@]}
+  do
+    if  [ $inc == $1 ]
+    then
+      return 1
+    fi
+  done
+
+  return 0
+
+}
+
+function create_puser () {
+  "${dscl}" -f "${dspath}" localonly -create /Local/Target/Users/puppet
+  "${dscl}" -f "${dspath}" localonly -create /Local/Target/Users/puppet UniqueID $1
+  "${dscl}" -f "${dspath}" localonly -create /Local/Target/Users/puppet PrimaryGroupID $2
+}
+
+function create_pgroup () {
+  "${dscl}" -f "${dspath}" localonly -create /Local/Target/Groups/puppet
+  "${dscl}" -f "${dspath}" localonly -create /Local/Target/Groups/puppet PrimaryGroupID $1
+}
+
+function scan_users () {
+  UniqueIDS=(`"${dscl}" -f "${dspath}" localonly  list /Local/Target/Users UniqueID | $awk '{print $2}'`);
+
+  #first just check for UID 52
+  if idFree '52' UniqueIDS[@]
+  then
+    last_user_id='52'
+  else
+    for possibleUID in {450..495}
+    do
+      if idFree $possibleUID UniqueIDS[@]
+      then
+        last_user_id=$possibleUID
+        #echo $last_good_id
+      fi
+    done
+  fi
+}
+
+function scan_groups () {
+  GroupIDS=(`"${dscl}" -f "${dspath}" localonly list /Local/Target/Groups PrimaryGroupID | $awk '{print $2}'`);
+  #check for 52 for group, if it's free, take it, don't bother doing the big search
+  if idFree '52' GroupIDS[@]
+  then
+    last_group_id='52'
+  else
+   for groupID in {450..495}
+    do
+     if idFree $groupID GroupIDS[@]
+     then
+        last_group_id=$groupID
+      fi
+    done
+  fi
+}
+
+echo "looking for Puppet User"
+"${dscl}" -f "${dspath}" localonly -read /Local/Target/Users/puppet
+puser_exists=$?
+echo "Looking for Puppet Group"
+"${dscl}" -f "${dspath}" localonly -read /Local/Target/Groups/puppet
+pgroup_exists=$?
+# exit status 56 indicates user/group not found
+# exit status 0 indicates user/group does exist
+
+if [ $pgroup_exists == '0' ] && [ $puser_exists == '0' ]; then
+  #Puppet user and group already exist
+  echo "Puppet User / Group already exist, not adding anything"
+  #storing the existing UID/GID to set permissions for /var/lib/puppet and /etc/puppet/puppet.conf
+  last_group_id=`"${dscl}" -f "${dspath}" localonly -read /Local/Target/Groups/puppet PrimaryGroupID | awk '{print $2}'`
+  last_user_id=`"${dscl}" -f "${dspath}" localonly -read /Local/Target/Users/puppet UniqueID | awk '{print $2}'`
+elif [ $pgroup_exists == '0' ] && [ $puser_exists == '56' ]; then
+  #puppet group exists, but user does not
+  last_group_id=`"${dscl}" -f "${dspath}" localonly -read /Local/Target/Groups/puppet PrimaryGroupID | awk '{print $2}'`
+  scan_users
+  echo "Creating Puppet User (uid: $last_user_id) in existing Puppet Group (gid: $last_group_id)"
+  create_puser $last_user_id $last_group_id
+elif [ $pgroup_exists == '56' ] && [ $puser_exists == '0' ]; then
+  #puppet user exists, but group does not
+  last_user_id=`"${dscl}" -f "${dspath}" localonly -read /Local/Target/Users/puppet UniqueID | awk '{print $2}'`
+  scan_groups
+  echo "Creating Puppet Group (gid: $last_group_id), Puppet User exists (uid: $last_user_id)"
+  create_pgroup $last_group_id
+elif [ $pgroup_exists == '56' ] && [ $puser_exists == '56' ]; then
+  scan_users
+  scan_groups
+  echo "Creating Puppet User (uid: $last_user_id) in new Puppet Group (gid: $last_group_id)"
+  create_pgroup $last_group_id
+  create_puser $last_user_id $last_group_id
+else
+  echo "Something went wrong and user creation will need to be done manually"
+fi

data/ext/osx/preflight.erb

@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+# Make sure that old puppet cruft is removed
+# This also allows us to downgrade puppet as
+# it's more likely that installing old versions
+# over new will cause issues.
+#
+# ${3} is the destination volume so that this works correctly
+# when being installed to volumes other than the current OS.
+
+<%- ["@apple_libdir", "@apple_sbindir", "@apple_bindir", "@apple_docdir", "@package_name"].each do |i| -%>
+  <%- val = instance_variable_get(i) -%>
+  <%- raise "Critical variable #{i} is unset!" if val.nil? or val.empty? -%>
+<%- end -%>
+
+# remove ruby library files. Because hiera and puppet both place a "hiera"
+# directory in the libdir, we have to be sure we only delete the files
+# belonging to this project. In this case, we only delete files from within
+# the 'hiera' directory, while deleting the entire puppet directory.
+<%- Dir.chdir("lib") do -%>
+  <%- [@apple_old_libdir, @apple_libdir].compact.each do |libdir| -%>
+    <%- Dir["hiera/**/*"].select{ |i| File.file?(i) }.each do |file| -%>
+/bin/rm -f "${3}<%= libdir %>/<%= file %>"
+    <%- end -%>
+    <%- Dir.glob("*").each do |file| -%>
+      <%- next if file == "hiera" -%>
+      <%- if File.directory?(file) -%>
+/bin/rm -Rf "${3}<%= libdir %>/<%= file %>"
+      <%- else -%>
+/bin/rm -f "${3}<%= libdir %>/<%= file %>"
+      <%- end -%>
+    <%- end -%>
+  <%- end -%>
+<%- end -%>
+
+# remove bin files
+<%- Dir.chdir("bin") do -%>
+    <%- Dir.glob("*").each do |file| -%>
+/bin/rm -f "${3}<%= @apple_bindir %>/<%= file %>"
+  <%- end -%>
+<%- end -%>
+
+# remove old doc files
+/bin/rm -Rf "${3}<%= @apple_docdir %>/<%= @package_name %>"
+
+# These files used to live in the sbindir but were
+# removed in Pupppet >= 3.0. Remove them
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetca"
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetd"
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetmasterd"
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetqd"
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetrun"

data/ext/osx/prototype.plist.erb

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIdentifier</key>
+	<string><%= @title %></string>
+	<key>CFBundleShortVersionString</key>
+	<string><%= @version %></string>
+	<key>IFMajorVersion</key>
+	<integer><%= @package_major_version %></integer>
+	<key>IFMinorVersion</key>
+	<integer><%= @package_minor_version %></integer>
+	<key>IFPkgBuildDate</key>
+	<date><%= @build_date %></date>
+	<key>IFPkgFlagAllowBackRev</key>
+	<false/>
+	<key>IFPkgFlagAuthorizationAction</key>
+	<string>RootAuthorization</string>
+	<key>IFPkgFlagDefaultLocation</key>
+	<string>/</string>
+	<key>IFPkgFlagFollowLinks</key>
+	<true/>
+	<key>IFPkgFlagInstallFat</key>
+	<false/>
+	<key>IFPkgFlagIsRequired</key>
+	<false/>
+	<key>IFPkgFlagOverwritePermissions</key>
+	<false/>
+	<key>IFPkgFlagRelocatable</key>
+	<false/>
+	<key>IFPkgFlagRestartAction</key>
+	<string><%= @pm_restart %></string>
+	<key>IFPkgFlagRootVolumeOnly</key>
+	<true/>
+	<key>IFPkgFlagUpdateInstalledLanguages</key>
+	<false/>
+</dict>
+</plist>

data/ext/osx/puppet.plist

@@ -26,7 +26,5 @@
         <string>/var/log/puppetlabs/puppet/puppet.log</string>
         <key>StandardOutPath</key>
         <string>/var/log/puppetlabs/puppet/puppet.log</string>
-        <key>SessionCreate</key>
-        <true />
 </dict>
 </plist>

data/ext/project_data.yaml

@@ -13,9 +13,8 @@ gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
 gem_test_files: 'spec/**/*'
 gem_executables: 'puppet'
 gem_default_executables: 'puppet'
-gem_license: 'Apache-2.0'
 gem_forge_project: 'puppet'
-gem_required_ruby_version: '>= 2.3.0'
+gem_required_ruby_version: '>= 2.5.0'
 gem_required_rubygems_version: '> 1.3.1'
 gem_runtime_dependencies:
   facter: ['> 2.0.1', '< 5']
@@ -24,7 +23,6 @@ gem_runtime_dependencies:
   fast_gettext: '~> 1.1'
   locale: '~> 2.1'
   multi_json: '~> 1.10'
-  httpclient: '~> 2.8'
   puppet-resource_api: '~>1.5'
   concurrent-ruby: '~> 1.0'
   deep_merge: '~> 1.0'
@@ -41,22 +39,10 @@ gem_platform_dependencies:
   x86-mingw32:
     gem_runtime_dependencies:
       ffi: ['> 1.9.24', '< 2']
-      # win32-xxxx gems are pinned due to PUP-6445
-      win32-dir: ['>= 0.4.9', '<= 0.7.2']
-      win32-process: '= 0.7.5'
-      # Use of win32-security is deprecated
-      win32-security: '= 0.2.5'
-      win32-service: '= 0.8.8'
       minitar: '~> 0.9'
   x64-mingw32:
     gem_runtime_dependencies:
       ffi: ['> 1.9.24', '< 2']
-      # win32-xxxx gems are pinned due to PUP-6445
-      win32-dir: ['>= 0.4.9', '<= 0.7.2']
-      win32-process: '= 0.7.5'
-      # Use of win32-security is deprecated
-      win32-security: '= 0.2.5'
-      win32-service: '= 0.8.8'
       minitar: '~> 0.9'
 bundle_platforms:
   universal-darwin: all

data/ext/redhat/fileserver.conf

@@ -0,0 +1,41 @@
+# fileserver.conf
+
+# Puppet automatically serves PLUGINS and FILES FROM MODULES: anything in
+# <module name>/files/<file name> is available to authenticated nodes at
+# puppet:///modules/<module name>/<file name>. You do not need to edit this
+# file to enable this.
+
+# MOUNT POINTS
+
+# If you need to serve files from a directory that is NOT in a module,
+# you must create a static mount point in this file:
+#
+# [extra_files]
+#   path /etc/puppet/files
+#   allow *
+#
+# In the example above, anything in /etc/puppet/files/<file name> would be
+# available to authenticated nodes at puppet:///extra_files/<file name>.
+#
+# Mount points may also use three placeholders as part of their path:
+#
+# %H - The node's certname.
+# %h - The portion of the node's certname before the first dot. (Usually the
+#      node's short hostname.)
+# %d - The portion of the node's certname after the first dot. (Usually the
+#      node's domain name.)
+
+# PERMISSIONS
+
+# Every static mount point should have an `allow *` line; setting more
+# granular permissions in this file is deprecated. Instead, you can
+# control file access in auth.conf by controlling the
+# /file_metadata/<mount point> and /file_content/<mount point> paths:
+#
+# path ~ ^/file_(metadata|content)/extra_files/
+# auth yes
+# allow /^(.+)\.example\.com$/
+# allow_ip 192.168.100.0/24
+#
+# If added to auth.conf BEFORE the "path /file" rule, the rule above
+# will add stricter restrictions to the extra_files mount point.

data/ext/redhat/logrotate

@@ -0,0 +1,21 @@
+# Generic logrotate config for Red Hat systems. Works with both official
+# Fedora and RHEL packages as well as PuppetLabs distributions.
+
+/var/log/puppetlabs/masterhttp.log /var/log/puppet/masterhttp.log {
+  compress
+  missingok
+  notifempty
+  nocreate
+}
+
+/var/log/puppetlabs/puppetd.log /var/log/puppet/puppetd.log {
+  compress
+  missingok
+  notifempty
+  nocreate
+  sharedscripts
+  postrotate
+   ([ -x /etc/init.d/puppet ] && /etc/init.d/puppet rotate > /dev/null 2>&1) ||
+    ([ -x /usr/bin/systemctl ] && /usr/bin/systemctl kill -s USR2 puppet.service > /dev/null 2>&1) || true
+  endscript
+}