.gitlab-ci.yml

@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length rule:truthy
 stages:
   - syntax
   - unit
@@ -41,4 +42,3 @@ parallel_spec-Ruby 2.4.5-Puppet ~> 5:
     - bundle exec rake parallel_spec
   variables:
     PUPPET_GEM_VERSION: '~> 5'
-

.rubocop.yml

@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length rule:indentation
 require:
 - rubocop-rspec
 - rubocop-i18n

.sync.yml

@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length
 .travis.yml:
   user: camptocamp
   secure: "ASTRdmLjJNa1NvHy2LRGvmvUeth6W3Fh/alYWvcvI8nDDsdkweHk0iXhcXZwtMQReb0NI5vJiRNXNy7a3XySC4+SP3hfHuDU58H2FqC4Ff0EHRPRHTEiXf7xmN53RxXYXZQvrFfqUb6tIsBNVKVmsYWNe01k8NVKPyYDfQB75PQ="
@@ -14,3 +15,5 @@ Gemfile:
       - gem: 'github_changelog_generator'
 Rakefile:
   changelog_version_tag_pattern: '%s'
+spec/spec_helper.rb:
+  mock_with: :rspec

.travis.yml

@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length rule:truthy
 os: linux
 dist: xenial
 language: ruby

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [2.11.0](https://github.com/camptocamp/puppet-systemd/tree/2.11.0) (2021-01-19)
+
+[Full Changelog](https://github.com/camptocamp/puppet-systemd/compare/2.10.0...2.11.0)
+
+### Added
+
+- Permit using arrays to make extending lists easier [\#164](https://github.com/camptocamp/puppet-systemd/pull/164) ([jcpunk](https://github.com/jcpunk))
+- Add parameter for ENCs to make loginctl\_users easily [\#163](https://github.com/camptocamp/puppet-systemd/pull/163) ([jcpunk](https://github.com/jcpunk))
+- Add ability to specify supported option 'infinity' for LimitNPROC [\#152](https://github.com/camptocamp/puppet-systemd/pull/152) ([hdeheer](https://github.com/hdeheer))
+
+### Fixed
+
+- Fix tests with rspec-puppet 2.8.0 [\#174](https://github.com/camptocamp/puppet-systemd/pull/174) ([raphink](https://github.com/raphink))
+
 ## [2.10.0](https://github.com/camptocamp/puppet-systemd/tree/2.10.0) (2020-08-21)
 
 [Full Changelog](https://github.com/camptocamp/puppet-systemd/compare/2.9.0...2.10.0)

README.md

@@ -342,3 +342,5 @@ loginctl_user { 'foo':
   linger => enabled,
 }
 ```
+
+or as a hash via the `systemd::loginctl_users` parameter.

REFERENCE.md

@@ -203,6 +203,15 @@ Data type: `Systemd::LogindSettings`
 
 Config Hash that is used to configure settings in logind.conf
 
+##### `loginctl_users`
+
+Data type: `Hash`
+
+Config Hash that is used to generate instances of our type
+`loginctl_user`.
+
+Default value: `{}`
+
 ##### `dropin_files`
 
 Data type: `Hash`
@@ -912,7 +921,7 @@ Alias of `Struct[{
 
 The Systemd::JournaldSettings::Ensure data type.
 
-Alias of `Struct[{'ensure' => Enum['present','absent']}]`
+Alias of `Struct[{ 'ensure' => Enum['present','absent'] }]`
 
 ### `Systemd::LogindSettings`
 
@@ -949,7 +958,7 @@ Alias of `Struct[{
 
 The Systemd::LogindSettings::Ensure data type.
 
-Alias of `Struct[{'ensure' => Enum['present','absent']}]`
+Alias of `Struct[{ 'ensure' => Enum['present','absent'] }]`
 
 ### `Systemd::ServiceLimits`
 

appveyor.yml

@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length rule:truthy
 version: 1.1.x.{build}
 branches:
   only:

manifests/dropin_file.pp

@@ -47,7 +47,7 @@
 #   Useful if the daemon needs to be reloaded before a service is refreshed.
 #   May cause multiple daemon reloads.
 #
-define systemd::dropin_file(
+define systemd::dropin_file (
   Systemd::Unit                               $unit,
   Systemd::Dropin                             $filename                = $name,
   Enum['present', 'absent', 'file']           $ensure                  = 'present',
@@ -75,12 +75,12 @@
 
   if $ensure != 'absent' {
     ensure_resource('file', "${path}/${unit}.d", {
-      ensure                  => directory,
-      owner                   => 'root',
-      group                   => 'root',
-      recurse                 => $::systemd::purge_dropin_dirs,
-      purge                   => $::systemd::purge_dropin_dirs,
-      selinux_ignore_defaults => $selinux_ignore_defaults,
+        ensure                  => directory,
+        owner                   => 'root',
+        group                   => 'root',
+        recurse                 => $systemd::purge_dropin_dirs,
+        purge                   => $systemd::purge_dropin_dirs,
+        selinux_ignore_defaults => $selinux_ignore_defaults,
     })
   }
 

manifests/init.pp

@@ -81,6 +81,10 @@
 # @param logind_settings
 #   Config Hash that is used to configure settings in logind.conf
 #
+# @param loginctl_users
+#   Config Hash that is used to generate instances of our type
+#   `loginctl_user`.
+#
 # @param dropin_files
 #   Configure dropin files via hiera with factory pattern
 class systemd (
@@ -110,9 +114,9 @@
   Systemd::JournaldSettings                              $journald_settings,
   Boolean                                                $manage_logind,
   Systemd::LogindSettings                                $logind_settings,
+  Hash                                                   $loginctl_users = {},
   Hash                                                   $dropin_files = {},
-){
-
+) {
   contain systemd::systemctl::daemon_reload
 
   create_resources('systemd::service_limits', $service_limits)

manifests/journald.pp

@@ -4,26 +4,25 @@
 #
 # https://www.freedesktop.org/software/systemd/man/journald.conf.html
 class systemd::journald {
-
   assert_private()
 
-  service{'systemd-journald':
+  service { 'systemd-journald':
     ensure => running,
   }
   $systemd::journald_settings.each |$option, $value| {
-    ini_setting{
+    ini_setting {
       $option:
         path    => '/etc/systemd/journald.conf',
         section => 'Journal',
         setting => $option,
         notify  => Service['systemd-journald'],
     }
     if $value =~ Hash {
-      Ini_setting[$option]{
+      Ini_setting[$option] {
         * => $value,
       }
     } else {
-      Ini_setting[$option]{
+      Ini_setting[$option] {
         value   => $value,
       }
     }

manifests/logind.pp

@@ -4,28 +4,37 @@
 #
 # https://www.freedesktop.org/software/systemd/man/logind.conf.html
 class systemd::logind {
-
   assert_private()
 
-  service{'systemd-logind':
+  service { 'systemd-logind':
     ensure => running,
   }
   $systemd::logind_settings.each |$option, $value| {
-    ini_setting{
+    ini_setting {
       $option:
         path    => '/etc/systemd/logind.conf',
         section => 'Login',
         setting => $option,
         notify  => Service['systemd-logind'],
     }
     if $value =~ Hash {
-      Ini_setting[$option]{
+      Ini_setting[$option] {
         * => $value,
       }
+    } elsif $value =~ Array {
+      Ini_setting[$option] {
+        value   => join($value, ' '),
+      }
     } else {
-      Ini_setting[$option]{
+      Ini_setting[$option] {
         value   => $value,
       }
     }
   }
+
+  $systemd::loginctl_users.each |$loginctl_name, $loginctl_settings| {
+    loginctl_user { $loginctl_name:
+      * => $loginctl_settings,
+    }
+  }
 }

manifests/network.pp

@@ -11,8 +11,7 @@
   String                         $mode            = '0444',
   Boolean                        $show_diff       = true,
   Boolean                        $restart_service = true,
-){
-
+) {
   include systemd
 
   if $restart_service and $systemd::manage_networkd {

manifests/networkd.pp

@@ -7,8 +7,7 @@
 #
 class systemd::networkd (
   Enum['stopped','running'] $ensure = $systemd::networkd_ensure,
-){
-
+) {
   assert_private()
 
   $_enable_networkd = $ensure ? {
@@ -17,7 +16,7 @@
     default   => $ensure,
   }
 
-  service{ 'systemd-networkd':
+  service { 'systemd-networkd':
     ensure => $ensure,
     enable => $_enable_networkd,
   }

manifests/resolved.pp

@@ -56,8 +56,7 @@
   Optional[Variant[Boolean,Enum['no-negative']]] $cache              = $systemd::cache,
   Optional[Variant[Boolean,Enum['udp', 'tcp']]] $dns_stub_listener   = $systemd::dns_stub_listener,
   Boolean $use_stub_resolver                                         = $systemd::use_stub_resolver,
-){
-
+) {
   assert_private()
 
   $_enable_resolved = $ensure ? {
@@ -87,7 +86,7 @@
     } else {
       $_dns = join($dns, ' ')
     }
-    ini_setting{ 'dns':
+    ini_setting { 'dns':
       ensure  => 'present',
       value   => $_dns,
       setting => 'DNS',
@@ -103,7 +102,7 @@
     } else {
       $_fallback_dns = join($fallback_dns, ' ')
     }
-    ini_setting{ 'fallback_dns':
+    ini_setting { 'fallback_dns':
       ensure  => 'present',
       value   => $_fallback_dns,
       setting => 'FallbackDNS',
@@ -119,7 +118,7 @@
     } else {
       $_domains = join($domains, ' ')
     }
-    ini_setting{ 'domains':
+    ini_setting { 'domains':
       ensure  => 'present',
       value   => $_domains,
       setting => 'Domains',
@@ -136,7 +135,7 @@
   }
 
   if $_llmnr {
-    ini_setting{ 'llmnr':
+    ini_setting { 'llmnr':
       ensure  => 'present',
       value   => $_llmnr,
       setting => 'LLMNR',
@@ -153,7 +152,7 @@
   }
 
   if $_multicast_dns {
-    ini_setting{ 'multicast_dns':
+    ini_setting { 'multicast_dns':
       ensure  => 'present',
       value   => $_multicast_dns,
       setting => 'MulticastDNS',
@@ -170,7 +169,7 @@
   }
 
   if $_dnssec {
-    ini_setting{ 'dnssec':
+    ini_setting { 'dnssec':
       ensure  => 'present',
       value   => $_dnssec,
       setting => 'DNSSEC',
@@ -187,7 +186,7 @@
   }
 
   if $_dnsovertls {
-    ini_setting{ 'dnsovertls':
+    ini_setting { 'dnsovertls':
       ensure  => 'present',
       value   => $_dnsovertls,
       setting => 'DNSOverTLS',
@@ -204,7 +203,7 @@
   }
 
   if $cache {
-    ini_setting{ 'cache':
+    ini_setting { 'cache':
       ensure  => 'present',
       value   => $_cache,
       setting => 'Cache',
@@ -221,7 +220,7 @@
   }
 
   if $_dns_stub_listener {
-    ini_setting{ 'dns_stub_listener':
+    ini_setting { 'dns_stub_listener':
       ensure  => 'present',
       value   => $_dns_stub_listener,
       setting => 'DNSStubListener',
@@ -230,5 +229,4 @@
       notify  => Service['systemd-resolved'],
     }
   }
-
 }

manifests/service_limits.pp

@@ -29,15 +29,14 @@
 # @param restart_service
 #   Restart the managed service after setting the limits
 #
-define systemd::service_limits(
+define systemd::service_limits (
   Enum['present', 'absent', 'file'] $ensure                  = 'present',
   Stdlib::Absolutepath              $path                    = '/etc/systemd/system',
   Optional[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)$'] {

manifests/system.pp

@@ -3,11 +3,10 @@
 # This class provides a solution to enable accounting
 #
 class systemd::system {
-
   assert_private()
 
   $systemd::accounting.each |$option, $value| {
-    ini_setting{$option:
+    ini_setting { $option:
       ensure  => 'present',
       path    => '/etc/systemd/system.conf',
       section => 'Manager',