chef 18.3.0-x64-mingw-ucrt → 18.4.2-x64-mingw-ucrt

data/lib/chef/resource/apt_package.rb

@@ -52,6 +52,21 @@ class Chef
         options '--no-install-recommends'
       end
       ```
+
+      **Prevent the apt_package resource from installing packages with pattern matching names**:
+
+      By default, the apt_package resource will install the named package.
+      If it can't find a package with the exact same name, it will treat the package name as regular expression string and match with any package that matches that regular expression.
+      This may lead Chef Infra Client to install one or more packages with names that match that regular expression.
+
+      In this example, `anchor_package_regex true` prevents the apt_package resource from installing matching packages if it can't find the `lua5.3` package.
+
+      ```ruby
+      apt_package 'lua5.3' do
+        version '5.3.3-1.1ubuntu2'
+        anchor_package_regex true
+      end
+      ```
       DOC
 
       description "Use the **apt_package** resource to manage packages on Debian, Ubuntu, and other platforms that use the APT package system."
@@ -75,6 +90,10 @@ class Chef
         description: "A Hash of response file variables in the form of {'VARIABLE' => 'VALUE'}.",
         default: {}, desired_state: false
 
+      property :anchor_package_regex, [TrueClass, FalseClass],
+        introduced: "18.3",
+        description: "A Boolean flag that indicates whether the package name, which can be a regular expression, must match the entire name of the package (true) or if the regular expression is allowed to match a subset of the name (false).",
+        default: false
     end
   end
 end

data/lib/chef/resource/apt_repository.rb

@@ -99,6 +99,7 @@ class Chef
         ```
 
         **Add repository that needs custom options**:
+
         ```ruby
         apt_repository 'corretto' do
           uri          'https://apt.corretto.aws'
@@ -172,7 +173,7 @@ class Chef
         default: true, desired_state: false
 
       property :options, [String, Array],
-        description: "Additional options to set for the repository",
+        description: "Additional options to set for the repository.",
         default: [], coerce: proc { |x| Array(x) }
 
       default_action :add

data/lib/chef/resource/chef_client_systemd_timer.rb

@@ -176,7 +176,7 @@ class Chef
           }
 
           unit["Service"]["ConditionACPower"] = "true" unless new_resource.run_on_battery
-          unit["Service"]["CPUQuota"] = new_resource.cpu_quota if new_resource.cpu_quota
+          unit["Service"]["CPUQuota"] = "#{new_resource.cpu_quota}%" if new_resource.cpu_quota
           unit["Service"]["Environment"] = new_resource.environment.collect { |k, v| "\"#{k}=#{v}\"" } unless new_resource.environment.empty?
           unit
         end

data/lib/chef/resource/chocolatey_installer.rb

@@ -0,0 +1,207 @@
+class Chef
+  class Resource
+    class ChocolateyInstaller < Chef::Resource
+      provides :chocolatey_installer
+
+      description "Use the chocolatey_installer resource to ensure that Chocolatey itself is installed to your specification. Use the Chocolatey Feature resource to customize your install. Then use the Chocolatey Package resource to install packages on Windows via Chocolatey."
+      introduced "18.3"
+      examples <<~DOC
+          **Install Chocolatey**
+
+          ```ruby
+          chocolatey_installer 'latest' do
+            action :install
+          end
+          ```
+
+          **Uninstall Chocolatey**
+
+          ```ruby
+          chocolatey_installer 'Some random verbiage' do
+            action :uninstall
+          end
+          ```
+
+          **Install Chocolatey with Parameters**
+
+          ```ruby
+          chocolatey_installer 'latest' do
+            action :install
+            download_url "https://www.contoso.com/foo"
+            chocolatey_version '2.12.24'
+          end
+          ```
+
+          ```ruby
+          chocolatey_installer 'latest' do
+            action :install
+            download_url "c:\\foo\foo.nupkg"
+            chocolatey_version '2.12.24'
+          end
+          ```
+
+          **Upgrade Chocolatey with Parameters**
+
+          ```ruby
+          chocolatey_installer 'latest' do
+            action :upgrade
+            chocolatey_version '2.12.24'
+          end
+          ```
+      DOC
+
+      allowed_actions :install, :uninstall, :upgrade
+
+      property :download_url, String,
+        description: "The URL to download Chocolatey from. This sets the value of $env:ChocolateyDownloadUrl and causes the installer to choose an alternate download location. If this is not set, Chocolatey installs fall back to the official Chocolatey community repository to download Chocolatey from. It can also be used for offline installation by providing a path to a Chocolatey.nupkg."
+
+      property :chocolatey_version, String,
+        description: "Specifies a target version of Chocolatey to install. By default, the latest stable version is installed. This will use the value in $env:ChocolateyVersion by default, if that environment variable is present. This parameter is ignored if download_url is set."
+
+      property :use_native_unzip, [TrueClass, FalseClass], default: false,
+        description: "If set, uses built-in Windows decompression tools instead of 7zip when unpacking the downloaded nupkg. This will be set by default if use_native_unzip is set to a value other than 'false' or '0'. This parameter will be ignored in PS 5+ in favour of using the Expand-Archive built in PowerShell cmdlet directly."
+
+      property :ignore_proxy, [TrueClass, FalseClass], default: false,
+        description: "If set, ignores any configured proxy. This will override any proxy environment variables or parameters. This will be set by default if ignore_proxy is set to a value other than 'false' or '0'."
+
+      property :proxy_url, String,
+        description: "Specifies the proxy URL to use during the download."
+
+      property :proxy_user, String,
+        description: "The username to use to build a proxy credential with. Will be consumed by the proxy_credential property if both this property and proxy_password are set"
+
+      property :proxy_password, String,
+        description: "The password to use to build a proxy credential with. Will be consumed by the proxy_credential property if both this property and proxy_user are set"
+
+      load_current_value do
+        current_state = is_choco_installed?
+        current_value_does_not_exist! if current_state == false
+        current_state
+      end
+
+      def is_choco_installed?
+        ::File.exist?("#{ENV["ALLUSERSPROFILE"]}\\chocolatey\\bin\\choco.exe")
+      end
+
+      def get_choco_version
+        powershell_exec("choco --version").result
+      end
+
+      def existing_version
+        Gem::Version.new(get_choco_version)
+      end
+
+      def define_resource_requirements
+        requirements.assert(:install, :upgrade).each do |a|
+          a.assertion do
+            # This is an exclusive OR - XOR - we're trying to coax an error out if one, but not both,
+            # parameters are empty.
+            new_resource.proxy_user.nil? != new_resource.proxy_password.nil?
+          end
+          a.failure_message(Chef::Exceptions::ValidationFailed, "You must specify both a proxy_user and a proxy_password")
+          a.whyrun("Assuming that if you have configured a 'proxy_user' you must also supply a 'proxy_password'")
+        end
+      end
+
+      action :install, description: "Installs Chocolatey package manager" do
+        if new_resource.download_url
+          powershell_exec("Set-Item -path env:ChocolateyDownloadUrl -Value #{new_resource.download_url}")
+        end
+
+        if new_resource.chocolatey_version
+          powershell_exec("Set-Item -path env:ChocolateyVersion -Value #{new_resource.chocolatey_version}")
+        end
+
+        if new_resource.use_native_unzip
+          powershell_exec("Set-Item -path env:ChocolateyUseWindowsCompression -Value true")
+        end
+
+        if new_resource.ignore_proxy
+          powershell_exec("Set-Item -path env:ChocolateyIgnoreProxy -Value true")
+        end
+
+        if new_resource.proxy_url
+          powershell_exec("Set-Item -path env:ChocolateyProxyLocation -Value #{new_resource.proxy_url}")
+        end
+
+        if new_resource.proxy_user && new_resource.proxy_password
+          powershell_exec("Set-Item -path env:ChocolateyProxyUser -Value #{new_resource.proxy_user}; Set-Item -path env:ChocolateyProxyPassword -Value #{new_resource.proxy_password}")
+        end
+
+        # note that Invoke-Expression is being called on the downloaded script (outer parens),
+        # not triggering the script download (inner parens)
+        converge_if_changed do
+          powershell_exec("Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))").error!
+        end
+      end
+
+      action :upgrade, description: "Upgrades the Chocolatey package manager" do
+        if new_resource.chocolatey_version
+          proposed_version = Gem::Version.new(new_resource.chocolatey_version)
+        else
+          proposed_version = nil
+        end
+
+        if new_resource.download_url
+          powershell_exec("Set-Item -path env:ChocolateyDownloadUrl -Value #{new_resource.download_url}")
+        end
+
+        if new_resource.chocolatey_version
+          powershell_exec("Set-Item -path env:ChocolateyVersion -Value #{new_resource.chocolatey_version}")
+        end
+
+        if new_resource.use_native_unzip
+          powershell_exec("Set-Item -path env:ChocolateyUseWindowsCompression -Value true")
+        end
+
+        if new_resource.ignore_proxy
+          powershell_exec("Set-Item -path env:ChocolateyIgnoreProxy -Value true")
+        end
+
+        if new_resource.proxy_url
+          powershell_exec("Set-Item -path env:ChocolateyProxyLocation -Value #{new_resource.proxy_url}")
+        end
+
+        if new_resource.proxy_user && new_resource.proxy_password
+          powershell_exec("Set-Item -path env:ChocolateyProxyUser -Value #{new_resource.proxy_user}; Set-Item -path env:ChocolateyProxyPassword -Value #{new_resource.proxy_password}")
+        end
+
+        if proposed_version && existing_version < proposed_version
+          powershell_exec("Set-Item -path env:ChocolateyVersion -Value #{proposed_version}")
+        else
+          powershell_exec("Remove-Item -path env:ChocolateyVersion")
+        end
+
+        converge_by("upgrade choco version") do
+          powershell_exec("choco upgrade Chocolatey -y").result
+        end
+      end
+
+      action :uninstall, description: "Uninstall Chocolatey package manager" do
+        path = "c:\\programdata\\chocolatey\\bin"
+        if File.exists?(path)
+          converge_by("Uninstall Choco") do
+            powershell_code = <<~CODE
+              Remove-Item $env:ALLUSERSPROFILE\\chocolatey -Recurse -Force
+              [Environment]::SetEnvironmentVariable("ChocolateyLastPathUpdate", $null ,"User")
+              [Environment]::SetEnvironmentVariable("ChocolateyToolsLocation", $null ,"User")
+              [Environment]::SetEnvironmentVariable("ChocolateyInstall", $null ,"Machine")
+              $path = [System.Environment]::GetEnvironmentVariable(
+                  'PATH',
+                  'Machine'
+              )
+              $path = ($path.Split(';') | Where-Object { $_ -ne "#{path}" }) -join ";"
+              [System.Environment]::SetEnvironmentVariable(
+                  'PATH',
+                  $path,
+                  'Machine'
+              )
+            CODE
+            powershell_exec(powershell_code).error!
+          end
+        end
+        Chef::Log.warn("Chocolatey is already uninstalled.")
+      end
+    end
+  end
+end

data/lib/chef/resource/chocolatey_package.rb

@@ -67,6 +67,14 @@ class Chef
         description: "The name of the package. Default value: the name of the resource block.",
         coerce: proc { |x| [x].flatten }
 
+      property :bulk_query, [TrueClass, FalseClass],
+        description: "Bulk query the chocolatey server?  This will cause the provider to list all packages instead of doing individual queries.",
+        default: false
+
+      property :use_choco_list, [TrueClass, FalseClass],
+        description: "Use choco list for getting the locally installed packages, rather than reading the nupkg database directly?  This defaults to false, since reading the package data is faster.",
+        default: false
+
       property :version, [String, Array],
         description: "The version of a package to be installed or upgraded.",
         coerce: proc { |x| [x].flatten }

data/lib/chef/resource/homebrew_package.rb

@@ -63,7 +63,7 @@ class Chef
       allowed_actions :install, :upgrade, :remove, :purge
 
       property :homebrew_user, [ String, Integer ],
-        description: "The name or uid of the Homebrew owner to be used by #{ChefUtils::Dist::Infra::PRODUCT} when executing a command.\n\n#{ChefUtils::Dist::Infra::PRODUCT}, by default, will attempt to execute a Homebrew command as the owner of the `/usr/local/bin/brew` executable on x86_64 machines or `/opt/homebrew/bin/brew` executable on arm64 machines. If that executable does not exist, #{ChefUtils::Dist::Infra::PRODUCT} will attempt to find the user by executing `which brew`. If that executable cannot be found, #{ChefUtils::Dist::Infra::PRODUCT} will print an error message: `Could not find the 'brew' executable in /usr/local/bin, /opt/homebrew/bin, or anywhere on the path.`.\n\nSet this property to specify the Homebrew owner for situations where Chef Infra Client cannot automatically detect the correct owner.'"
+        description: "The name or UID of the Homebrew owner to be used by #{ChefUtils::Dist::Infra::PRODUCT} when executing a command.\n\n#{ChefUtils::Dist::Infra::PRODUCT}, by default, will attempt to execute a Homebrew command as the owner of the `/usr/local/bin/brew` executable on x86_64 machines or `/opt/homebrew/bin/brew` executable on arm64 machines. If that executable doesn't exist, #{ChefUtils::Dist::Infra::PRODUCT} will attempt to find the user by executing `which brew`. If that executable can't be found, #{ChefUtils::Dist::Infra::PRODUCT} will print an error message: `Couldn't find the 'brew' executable anywhere on the path.`.\n\nSet this property to specify the Homebrew owner for situations where Chef Infra Client cannot automatically detect the correct owner.'"
 
     end
   end

data/lib/chef/resource/locale.rb

@@ -112,8 +112,11 @@ class Chef
           end
 
           requirements.assert(:all_actions) do |a|
-            # RHEL/CentOS type platforms don't have locale-gen
-            a.assertion { which("locale-gen") }
+            a.assertion do
+              # RHEL/CentOS type platforms don't have locale-gen
+              # Windows has locale-gen as part of the install, but not in the path
+              which("locale-gen") || windows?
+            end
             a.failure_message(Chef::Exceptions::ProviderNotFound, "The locale resource requires the locale-gen tool")
           end
         end

data/lib/chef/resource/macos_pkg.rb

@@ -0,0 +1,111 @@
+#
+# Author:: Joshua Timberman (<jtimberman@chef.io>)
+# Author:: William Theaker (<william.theaker+chef@gusto.com>)
+# Copyright:: Copyright (c) Chef Software Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../resource"
+
+class Chef
+  class Resource
+    class MacosPkg < Chef::Resource
+      provides(:macos_pkg) { true }
+
+      description "Use the **macos_pkg** resource to install a macOS `.pkg` file, optionally downloading it from a remote source. A `package_id` property must be provided for idempotency. Either a `file` or `source` property is required."
+      introduced "18.1"
+      examples <<~DOC
+        **Install osquery**:
+
+        ```ruby
+        macos_pkg 'osquery' do
+          checksum   '1fea8ac9b603851d2e76c5fc73138a468a3075a3002c8cb1fd7fff53b889c4dd'
+          package_id 'io.osquery.agent'
+          source     'https://pkg.osquery.io/darwin/osquery-5.8.2.pkg'
+          action     :install
+        end
+        ```
+      DOC
+
+      allowed_actions :install
+      default_action  :install
+
+      property :checksum, String,
+        description: "The sha256 checksum of the `.pkg` file to download."
+
+      property :file, String,
+        description: "The absolute path to the `.pkg` file on the local system."
+
+      property :headers, Hash,
+        description: "Allows custom HTTP headers (like cookies) to be set on the `remote_file` resource.",
+        desired_state: false
+
+      property :package_id, String,
+        description: "The package ID registered with `pkgutil` when a `pkg` or `mpkg` is installed.",
+        required: true
+
+      property :source, String,
+        description: "The remote URL used to download the `.pkg` file."
+
+      property :target, String,
+        description: "The device to install the package on.",
+        default: "/"
+
+      load_current_value do |new_resource|
+        if shell_out("pkgutil --pkg-info '#{new_resource.package_id}'").exitstatus == 0
+          Chef::Log.debug "#{new_resource.package_id} is already installed. To upgrade, try \"sudo pkgutil --forget '#{new_resource.package_id}'\""
+        else
+          current_value_does_not_exist!
+        end
+      end
+
+      action :install, description: "Installs the pkg." do
+        if new_resource.source.nil? && new_resource.file.nil?
+          raise "Must provide either a file or source property for macos_pkg resources."
+        end
+
+        if current_resource.nil?
+          if new_resource.source
+            remote_file pkg_file do
+              source new_resource.source
+              headers new_resource.headers if new_resource.headers
+              checksum new_resource.checksum if new_resource.checksum
+            end
+          end
+
+          converge_by "install #{pkg_file}" do
+            install_cmd = "installer -pkg #{pkg_file} -target #{new_resource.target}"
+
+            execute install_cmd do
+              action :run
+            end
+          end
+        end
+      end
+
+      action_class do
+        # @return [String] the path to the pkg file
+        def pkg_file
+          @pkg_file ||= if new_resource.file.nil?
+                          uri = URI.parse(new_resource.source)
+                          filename = ::File.basename(uri.path)
+                          "#{Chef::Config[:file_cache_path]}/#{filename}"
+                        else
+                          new_resource.file
+                        end
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/powershell_script.rb

@@ -21,7 +21,7 @@ class Chef
   class Resource
     class PowershellScript < Chef::Resource::WindowsScript
 
-      set_guard_inherited_attributes(:interpreter)
+      set_guard_inherited_attributes(:interpreter, :use_inline_powershell)
 
       provides :powershell_script, os: "windows"
 
@@ -39,6 +39,10 @@ class Chef
         equal_to: %w{powershell pwsh},
         description: "The interpreter type, `powershell` or `pwsh` (PowerShell Core)"
 
+      property :use_inline_powershell, [true, false],
+        default: false,
+        description: "Use inline powershell.dll rather than shelling out - this is faster, but could have different semantics to the traditional method.  In particular, it does not allow for streaming output, nor does it allow for passing custom parameters to the interpreter"
+
       property :convert_boolean_return, [true, false],
         default: false,
         description: <<~DESC

data/lib/chef/resource/service.rb

@@ -93,6 +93,9 @@ class Chef
       # if the service is masked or not
       property :masked, [ TrueClass, FalseClass ], skip_docs: true
 
+      # if the service is static or not
+      property :static, [ TrueClass, FalseClass ], skip_docs: true
+
       # if the service is indirect or not
       property :indirect, [ TrueClass, FalseClass ], skip_docs: true
 

data/lib/chef/resource/sudo.rb

@@ -59,6 +59,41 @@ class Chef
         nopasswd true
       end
       ```
+
+      **Create command aliases and assign them to a group**
+
+      ```ruby
+      sudo 'webteam' do
+        command_aliases [
+          {
+            'name': 'WEBTEAM_SYSTEMD_JBOSS',
+            'command_list': [
+              '/usr/bin/systemctl start eap7-standalone.service',
+              '/usr/bin/systemctl start jbcs-httpd24-httpd.service', \
+              '/usr/bin/systemctl stop eap7-standalone.service', \
+              '/usr/bin/systemctl stop jbcs-httpd24-httpd.service', \
+              '/usr/bin/systemctl restart eap7-standalone.service', \
+              '/usr/bin/systemctl restart jbcs-httpd24-httpd.service', \
+              '/usr/bin/systemctl --full edit eap7-standalone.service', \
+              '/usr/bin/systemctl --full edit jbcs-httpd24-httpd.service', \
+              '/usr/bin/systemctl daemon-reload',
+            ]
+          },
+          {
+            'name': 'GENERIC_SYSTEMD',
+            'command_list': [
+              '/usr/sbin/systemctl list-unit-files',
+              '/usr/sbin/systemctl list-timers', \
+              '/usr/sbin/systemctl is-active *', \
+              '/usr/sbin/systemctl is-enabled *',
+              ]
+          }
+        ]
+        nopasswd true
+        users '%webteam'
+        commands [ 'WEBTEAM_SYSTEMD_JBOSS', 'GENERIC_SYSTEMD' ]
+      end
+      ```
       DOC
 
       # According to the sudo man pages sudo will ignore files in an include dir that have a `.` or `~`
@@ -79,7 +114,7 @@ class Chef
         coerce: proc { |x| coerce_groups(x) }
 
       property :commands, Array,
-        description: "An array of full paths to commands this sudoer can execute.",
+        description: "An array of full paths to commands and/or command aliases this sudoer can execute.",
         default: ["ALL"]
 
       property :host, String,
@@ -110,7 +145,7 @@ class Chef
         default: []
 
       property :command_aliases, Array,
-        description: "Command aliases that can be used as allowed commands later in the configuration.",
+        description: "Command aliases that can be used as allowed commands later in the configuration. The object represents an array of hashes in the following format: `[{'name':'ALIAS1','command_list': [ 'command1', 'command2' ] }, {'name':'Alias2','command_list: [ 'command3', 'command4 arg1 arg2' ]}]`",
         default: []
 
       property :setenv, [TrueClass, FalseClass],

data/lib/chef/resource/support/ulimit.erb

@@ -2,6 +2,18 @@
 
 # Limits settings for <%= @ulimit_user %>
 
+<% unless @as_limit.nil? -%>
+<%= @ulimit_user -%> - as <%= @as_limit %>
+<% else -%><% unless @as_soft_limit.nil? -%><%= @ulimit_user -%> soft as <%= @as_soft_limit %><% end -%>
+<% unless @as_hard_limit.nil? -%><%= @ulimit_user -%> hard as <%= @as_hard_limit %><% end -%>
+<% end -%>
+
+<% unless @cpu_limit.nil? -%>
+<%= @ulimit_user -%> - cpu <%= @cpu_limit %>
+<% else -%><% unless @cpu_soft_limit.nil? -%><%= @ulimit_user -%> soft cpu <%= @cpu_soft_limit %><% end -%>
+<% unless @cpu_hard_limit.nil? -%><%= @ulimit_user -%> hard cpu <%= @cpu_hard_limit %><% end -%>
+<% end -%>
+
 <% unless @filehandle_limit.nil? -%>
 <%= @ulimit_user -%> - nofile <%= @filehandle_limit %>
 <% else -%><% unless @filehandle_soft_limit.nil? -%><%= @ulimit_user -%> soft nofile <%= @filehandle_soft_limit %><% end -%>
@@ -14,22 +26,50 @@
 <% unless @process_hard_limit.nil? -%><%= @ulimit_user -%> hard nproc <%= @process_hard_limit %><% end -%>
 <% end -%>
 
+<% unless @locks_limit.nil? -%>
+<%= @ulimit_user -%> - locks <%= @locks_limit %>
+<% end -%>
+
 <% unless @memory_limit.nil? -%>
 <%= @ulimit_user -%> - memlock <%= @memory_limit %>
 <% end -%>
 
+<% unless @maxlogins_limit.nil? -%>
+<%= @ulimit_user -%> - maxlogins <%= @maxlogins_limit %>
+<% else -%><% unless @maxlogins_soft_limit.nil? -%><%= @ulimit_user -%> soft maxlogins <%= @maxlogins_soft_limit %><% end -%>
+<% unless @maxlogins_hard_limit.nil? -%><%= @ulimit_user -%> hard maxlogins <%= @maxlogins_hard_limit %><% end -%>
+<% end -%>
+
+<% unless @msgqueue_limit.nil? -%>
+<%= @ulimit_user -%> - msgqueue <%= @msgqueue_limit %>
+<% else -%><% unless @msgqueue_soft_limit.nil? -%><%= @ulimit_user -%> soft msgqueue <%= @msgqueue_soft_limit %><% end -%>
+<% unless @msgqueue_hard_limit.nil? -%><%= @ulimit_user -%> hard msgqueue <%= @msgqueue_hard_limit %><% end -%>
+<% end -%>
+
 <% unless @core_limit.nil? -%>
 <%= @ulimit_user -%> - core <%= @core_limit %>
 <% else -%><% unless @core_soft_limit.nil? -%><%= @ulimit_user -%> soft core <%= @core_soft_limit %><% end -%>
 <% unless @core_hard_limit.nil? -%><%= @ulimit_user -%> hard core <%= @core_hard_limit %><% end -%>
 <% end -%>
 
+<% unless @sigpending_limit.nil? -%>
+<%= @ulimit_user -%> - sigpending <%= @sigpending_limit %>
+<% else -%><% unless @sigpending_soft_limit.nil? -%><%= @ulimit_user -%> soft sigpending <%= @sigpending_soft_limit %><% end -%>
+<% unless @sigpending_hard_limit.nil? -%><%= @ulimit_user -%> hard sigpending <%= @sigpending_hard_limit %><% end -%>
+<% end -%>
+
 <% unless @stack_limit.nil? -%>
 <%= @ulimit_user -%> - stack <%= @stack_limit %>
 <% else -%><% unless @stack_soft_limit.nil? -%><%= @ulimit_user -%> soft stack <%= @stack_soft_limit %><% end -%>
 <% unless @stack_hard_limit.nil? -%><%= @ulimit_user -%> hard stack <%= @stack_hard_limit %><% end -%>
 <% end -%>
 
+<% unless @rss_limit.nil? -%>
+<%= @ulimit_user -%> - rss <%= @rss_limit %>
+<% else -%><% unless @rss_soft_limit.nil? -%><%= @ulimit_user -%> soft rss <%= @rss_soft_limit %><% end -%>
+<% unless @rss_hard_limit.nil? -%><%= @ulimit_user -%> hard rss <%= @rss_hard_limit %><% end -%>
+<% end -%>
+
 <% unless @rtprio_limit.nil? -%>
 <%= @ulimit_user -%> - rtprio <%= @rtprio_limit %>
 <% else -%><% unless @rtprio_soft_limit.nil? -%><%= @ulimit_user -%> soft rtprio <%= @rtprio_soft_limit %><% end -%>

data/lib/chef/resource/user_ulimit.rb

@@ -56,19 +56,38 @@ class Chef
       DOC
 
       property :username, String, name_property: true
+      property :as_limit, [String, Integer]
+      property :as_soft_limit, [String, Integer]
+      property :as_hard_limit, [String, Integer]
       property :filehandle_limit, [String, Integer]
       property :filehandle_soft_limit, [String, Integer]
       property :filehandle_hard_limit, [String, Integer]
       property :process_limit, [String, Integer]
       property :process_soft_limit, [String, Integer]
       property :process_hard_limit, [String, Integer]
+      property :locks_limit, [String, Integer]
       property :memory_limit, [String, Integer]
+      property :maxlogins_limit, [String, Integer]
+      property :maxlogins_soft_limit, [String, Integer]
+      property :maxlogins_hard_limit, [String, Integer]
+      property :msgqueue_limit, [String, Integer]
+      property :msgqueue_soft_limit, [String, Integer]
+      property :msgqueue_hard_limit, [String, Integer]
       property :core_limit, [String, Integer]
       property :core_soft_limit, [String, Integer]
       property :core_hard_limit, [String, Integer]
+      property :cpu_limit, [String, Integer]
+      property :cpu_soft_limit, [String, Integer]
+      property :cpu_hard_limit, [String, Integer]
+      property :sigpending_limit, [String, Integer]
+      property :sigpending_soft_limit, [String, Integer]
+      property :sigpending_hard_limit, [String, Integer]
       property :stack_limit, [String, Integer]
       property :stack_soft_limit, [String, Integer]
       property :stack_hard_limit, [String, Integer]
+      property :rss_limit, [String, Integer]
+      property :rss_soft_limit, [String, Integer]
+      property :rss_hard_limit, [String, Integer]
       property :rtprio_limit, [String, Integer]
       property :rtprio_soft_limit, [String, Integer]
       property :rtprio_hard_limit, [String, Integer]
@@ -85,19 +104,38 @@ class Chef
           sensitive new_resource.sensitive
           variables(
             ulimit_user: new_resource.username,
+            as_limit: new_resource.as_limit,
+            as_soft_limit: new_resource.as_soft_limit,
+            as_hard_limit: new_resource.as_hard_limit,
             filehandle_limit: new_resource.filehandle_limit,
             filehandle_soft_limit: new_resource.filehandle_soft_limit,
             filehandle_hard_limit: new_resource.filehandle_hard_limit,
             process_limit: new_resource.process_limit,
             process_soft_limit: new_resource.process_soft_limit,
             process_hard_limit: new_resource.process_hard_limit,
+            locks_limit: new_resource.locks_limit,
             memory_limit: new_resource.memory_limit,
+            maxlogins_limit: new_resource.maxlogins_limit,
+            maxlogins_soft_limit: new_resource.maxlogins_soft_limit,
+            maxlogins_hard_limit: new_resource.maxlogins_hard_limit,
+            msgqueue_limit: new_resource.msgqueue_limit,
+            msgqueue_soft_limit: new_resource.msgqueue_soft_limit,
+            msgqueue_hard_limit: new_resource.msgqueue_hard_limit,
             core_limit: new_resource.core_limit,
             core_soft_limit: new_resource.core_soft_limit,
             core_hard_limit: new_resource.core_hard_limit,
+            cpu_limit: new_resource.cpu_limit,
+            cpu_soft_limit: new_resource.cpu_soft_limit,
+            cpu_hard_limit: new_resource.cpu_hard_limit,
+            sigpending_limit: new_resource.sigpending_limit,
+            sigpending_soft_limit: new_resource.sigpending_soft_limit,
+            sigpending_hard_limit: new_resource.sigpending_hard_limit,
             stack_limit: new_resource.stack_limit,
             stack_soft_limit: new_resource.stack_soft_limit,
             stack_hard_limit: new_resource.stack_hard_limit,
+            rss_limit: new_resource.rss_limit,
+            rss_soft_limit: new_resource.rss_soft_limit,
+            rss_hard_limit: new_resource.rss_hard_limit,
             rtprio_limit: new_resource.rtprio_limit,
             rtprio_soft_limit: new_resource.rtprio_soft_limit,
             rtprio_hard_limit: new_resource.rtprio_hard_limit,