diff --git a/manifests/service_limits.pp b/manifests/service_limits.pp index fb30dd3..53b6d14 100644 --- a/manifests/service_limits.pp +++ b/manifests/service_limits.pp @@ -1,80 +1,80 @@ # Adds a set of custom limits to the service # # @api public # # @see systemd.exec(5) # # @param name [Pattern['^.+\.(service|socket|mount|swap)$']] # The name of the service that you will be modifying # # @param ensure # Whether to drop a file or remove it # # @param path # The path to the main systemd settings directory # # @param selinux_ignore_defaults # If Puppet should ignore the default SELinux labels. # # @param limits # A Hash of service limits matching the settings in ``systemd.exec(5)`` # # * Mutually exclusive with ``$source`` # # @param source # A ``File`` resource compatible ``source`` # # * Mutually exclusive with ``$limits`` # # @param restart_service # Restart the managed service after setting the limits # define systemd::service_limits ( Enum['present', 'absent', 'file'] $ensure = 'present', Stdlib::Absolutepath $path = '/etc/systemd/system', Boolean $selinux_ignore_defaults = false, Optional[Systemd::ServiceLimits] $limits = undef, Optional[String] $source = undef, Boolean $restart_service = true ) { include systemd if $name !~ Pattern['^.+\.(service|socket|mount|swap)$'] { fail('$name must match Pattern["^.+\.(service|socket|mount|swap)$"]') } if $limits and !empty($limits) { $_content = template("${module_name}/limits.erb") } else { $_content = undef } if $ensure != 'absent' { if ($limits and !empty($limits)) and $source { fail('You may not supply both limits and source parameters to systemd::service_limits') } elsif ($limits == undef or empty($limits)) and ($source == undef) { fail('You must supply either the limits or source parameter to systemd::service_limits') } } systemd::dropin_file { "${name}-90-limits.conf": ensure => $ensure, unit => $name, filename => '90-limits.conf', path => $path, selinux_ignore_defaults => $selinux_ignore_defaults, content => $_content, source => $source, } if $restart_service { exec { "restart ${name} because limits": command => "systemctl restart ${name}", - path => $::path, + path => $facts['path'], refreshonly => true, subscribe => File["${path}/${name}.d/90-limits.conf"], } } } diff --git a/manifests/tmpfiles.pp b/manifests/tmpfiles.pp index a5fd03e..3b613db 100644 --- a/manifests/tmpfiles.pp +++ b/manifests/tmpfiles.pp @@ -1,23 +1,23 @@ # Update the systemd temp files # # @api public # # @see systemd-tmpfiles(8) # # @param operations # The operations to perform on the systemd tempfiles # # * All operations may be combined but you'll probably only ever want to # use ``create`` # class systemd::tmpfiles ( Array[Enum['create','clean','remove']] $operations = ['create'] ) { $_ops = join(prefix($operations, '--'), ' ') exec { 'systemd-tmpfiles': command => "systemd-tmpfiles ${_ops}", refreshonly => true, - path => $::path, + path => $facts['path'], } }