Merge pull request #150 from jordiprats/master

merge PR148
NTTCom-MS · Jul 1, 2019 · ec0c65e · ec0c65e
2 parents 381b9c6 + bea6046
commit ec0c65e
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.2.9
+
+* Added the ability to removed created files by adding ensure option  - thanks to [TuningYourCode](https://github.com/TuningYourCode) for this [PR-148](https://github.com/NTTCom-MS/eyp-systemd/pull/148)
+
 ## 0.2.8
 
 * added define for mounts: **systemd::mount**

diff --git a/manifests/logind.pp b/manifests/logind.pp
@@ -1,4 +1,5 @@
 class systemd::logind(
+                        $ensure                          = 'present',
                         $handle_hibernate_key            = 'hibernate',
                         $handle_lid_switch               = 'suspend',
                         $handle_lid_switch_docked        = 'ignore',
@@ -59,7 +60,7 @@
 
 
   file { '/etc/systemd/logind.conf':
-    ensure  => 'present',
+    ensure  => $ensure,
     owner   => 'root',
     group   => 'root',
     mode    => '0644',

diff --git a/manifests/mount.pp b/manifests/mount.pp
@@ -36,6 +36,8 @@
                         $on_failure       = [],
                         $partof           = undef,
                         $allow_isolate    = undef,
+                        # global
+                        $ensure           = 'present',
                       ) {
   if versioncmp($::puppetversion, '4.0.0') >= 0
   {
@@ -49,7 +51,7 @@
   $mount_name = regsubst(regsubst($where, '/', '-', 'G'), '^-', '', '')
 
   concat { "/etc/systemd/system/${mount_name}.mount":
-    ensure => 'present',
+    ensure => $ensure,
     owner  => 'root',
     group  => 'root',
     mode   => '0644',

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -1,5 +1,6 @@
 # puppet2sitepp @systemdservices
 define systemd::service (
+                          $ensure                      = 'present',
                           $servicename                 = $name,
                           $execstart                   = undef,
                           $execstop                    = undef,
@@ -91,7 +92,7 @@
   include ::systemd
 
   concat { "/etc/systemd/system/${servicename}.service":
-    ensure => 'present',
+    ensure => $ensure,
     owner  => 'root',
     group  => 'root',
     mode   => '0644',

diff --git a/manifests/service/dropin.pp b/manifests/service/dropin.pp
@@ -1,4 +1,5 @@
 define systemd::service::dropin (
+                                  $ensure                      = 'present',
                                   $dropin_order                = '99',
                                   $dropin_name                 = 'override',
                                   $purge_dropin_dir            = true,
@@ -87,7 +88,7 @@
   $dropin = true
 
   concat { "/etc/systemd/system/${servicename}.service.d/${dropin_order}-${dropin_name}.conf":
-    ensure => 'present',
+    ensure => $ensure,
     owner  => 'root',
     group  => 'root',
     mode   => '0644',

diff --git a/manifests/socket.pp b/manifests/socket.pp
@@ -7,6 +7,7 @@
 # [Install]
 # WantedBy=sockets.target
 define systemd::socket(
+                        $ensure           = 'present',
                         $listen_stream    = undef,
                         $listen_datagram  = undef,
                         $socket_name      = $name,
@@ -41,7 +42,7 @@
   }
 
   concat { "/etc/systemd/system/${socket_name}.socket":
-    ensure => 'present',
+    ensure => $ensure,
     owner  => 'root',
     group  => 'root',
     mode   => '0644',

diff --git a/manifests/system.pp b/manifests/system.pp
@@ -1,4 +1,5 @@
 class systemd::system(
+                        $ensure                           = 'present',
                         $cpu_affinity                     = undef,
                         $capability_bounding_set          = undef,
                         $crash_change_vt                  = undef,
@@ -54,7 +55,7 @@
                         $timer_slack_nsec                 = undef
                       ) {
   file { '/etc/systemd/system.conf':
-    ensure  => 'present',
+    ensure  => $ensure,
     owner   => 'root',
     group   => 'root',
     mode    => '0644',

diff --git a/manifests/sysvwrapper.pp b/manifests/sysvwrapper.pp
@@ -1,5 +1,6 @@
 define systemd::sysvwrapper (
                               $initscript,
+                              $ensure               = 'present',
                               $servicename          = $name,
                               $check_time           = '10m',
                               $wait_time_on_startup = '1s',
@@ -16,15 +17,15 @@
   }
 
   file { "${initscript}.sysvwrapper.status":
-    ensure  => 'present',
+    ensure  => $ensure,
     owner   => 'root',
     group   => 'root',
     mode    => '0750',
     content => template("${module_name}/sysv/status.erb"),
   }
 
   file { "${initscript}.sysvwrapper.wrapper":
-    ensure  => 'present',
+    ensure  => $ensure,
     owner   => 'root',
     group   => 'root',
     mode    => '0750',

diff --git a/manifests/target.pp b/manifests/target.pp
@@ -1,4 +1,5 @@
 define systemd::target(
+                        $ensure        = 'present',
                         $target_name   = $name,
                         # unit
                         $description   = undef,
@@ -17,7 +18,7 @@
   include ::systemd
 
   concat { "/etc/systemd/system/${target_name}.target":
-    ensure => 'present',
+    ensure => $ensure,
     owner  => 'root',
     group  => 'root',
     mode   => '0644',

diff --git a/manifests/timer.pp b/manifests/timer.pp
@@ -1,4 +1,5 @@
 define systemd::timer (
+                        $ensure               = 'present',
                         $timer_name           = $name,
                         $on_active_sec        = undef,
                         $on_boot_sec          = undef,
@@ -63,7 +64,7 @@
   }
 
   concat { "/etc/systemd/system/${timer_name}.timer":
-    ensure => 'present',
+    ensure => $ensure,
     owner  => 'root',
     group  => 'root',
     mode   => '0644',

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "eyp-systemd",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "author": "eyp",
   "summary": "management of systemd services, services dropins, sockets, timers, mounts, timesyncd, journald, logind and resolved",
   "license": "Apache-2.0",