From 90115b244619abbcf7e3c7298de6860007584e30 Mon Sep 17 00:00:00 2001 From: Stephan Eicher Date: Mon, 1 Jul 2019 17:06:54 +0200 Subject: [PATCH 1/2] Add basic removal function --- manifests/logind.pp | 3 ++- manifests/mount.pp | 3 ++- manifests/service.pp | 3 ++- manifests/service/dropin.pp | 3 ++- manifests/socket.pp | 3 ++- manifests/system.pp | 3 ++- manifests/sysvwrapper.pp | 5 +++-- manifests/target.pp | 3 ++- manifests/timer.pp | 3 ++- 9 files changed, 19 insertions(+), 10 deletions(-) diff --git a/manifests/logind.pp b/manifests/logind.pp index 7de7aae..7d12c35 100644 --- 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 index 6de7bba..e4e4b32 100644 --- a/manifests/mount.pp +++ b/manifests/mount.pp @@ -13,6 +13,7 @@ # WantedBy=multi-user.target # define systemd::mount( + $ensure = 'present', $what, $where = $name, $type = undef, @@ -49,7 +50,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 index fba8966..f188c15 100644 --- 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 index 201c9a3..6c53ca3 100644 --- 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 index 2862f20..65e61a6 100644 --- 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 index 6176819..8e541ea 100644 --- 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 index 153ff8c..fe83aef 100644 --- a/manifests/sysvwrapper.pp +++ b/manifests/sysvwrapper.pp @@ -1,4 +1,5 @@ define systemd::sysvwrapper ( + $ensure = 'present', $initscript, $servicename = $name, $check_time = '10m', @@ -16,7 +17,7 @@ } file { "${initscript}.sysvwrapper.status": - ensure => 'present', + ensure => $ensure, owner => 'root', group => 'root', mode => '0750', @@ -24,7 +25,7 @@ } file { "${initscript}.sysvwrapper.wrapper": - ensure => 'present', + ensure => $ensure, owner => 'root', group => 'root', mode => '0750', diff --git a/manifests/target.pp b/manifests/target.pp index 070bc77..7629cdb 100644 --- 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 index 536869f..fd04a8b 100644 --- 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', From bea60462a9d2c2f64c44407f31531f463d2d7267 Mon Sep 17 00:00:00 2001 From: Jordi Prats Date: Mon, 1 Jul 2019 17:43:02 +0200 Subject: [PATCH 2/2] lint + credits --- CHANGELOG.md | 4 ++++ manifests/mount.pp | 3 ++- manifests/sysvwrapper.pp | 2 +- metadata.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 077a5d9..16e134f 100644 --- 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/mount.pp b/manifests/mount.pp index e4e4b32..b934b04 100644 --- a/manifests/mount.pp +++ b/manifests/mount.pp @@ -13,7 +13,6 @@ # WantedBy=multi-user.target # define systemd::mount( - $ensure = 'present', $what, $where = $name, $type = undef, @@ -37,6 +36,8 @@ $on_failure = [], $partof = undef, $allow_isolate = undef, + # global + $ensure = 'present', ) { if versioncmp($::puppetversion, '4.0.0') >= 0 { diff --git a/manifests/sysvwrapper.pp b/manifests/sysvwrapper.pp index fe83aef..a1c5292 100644 --- a/manifests/sysvwrapper.pp +++ b/manifests/sysvwrapper.pp @@ -1,6 +1,6 @@ define systemd::sysvwrapper ( - $ensure = 'present', $initscript, + $ensure = 'present', $servicename = $name, $check_time = '10m', $wait_time_on_startup = '1s', diff --git a/metadata.json b/metadata.json index 4e48679..a68fd7a 100644 --- 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",