|
75 | 75 | } |
76 | 76 |
|
77 | 77 | $service_ensure = $ensure ? { 'absent' => false, default => true, } |
78 | | - $unit_name = systemd::escape($title) |
79 | 78 |
|
80 | | - systemd::manage_unit { "${unit_name}.service": |
| 79 | + systemd::manage_unit { "${title}.service": |
81 | 80 | ensure => $ensure, |
82 | 81 | unit_entry => $service_unit_overrides, |
83 | 82 | service_entry => { |
|
86 | 85 | 'Type' => 'oneshot', |
87 | 86 | }.filter |$key, $val| { $val =~ NotUndef } + $service_overrides, |
88 | 87 | } |
89 | | - systemd::manage_unit { "${unit_name}.timer": |
| 88 | + systemd::manage_unit { "${title}.timer": |
90 | 89 | ensure => $ensure, |
91 | 90 | unit_entry => $timer_unit_overrides, |
92 | 91 | timer_entry => $_timer_spec + $timer_overrides, |
|
95 | 94 | }, |
96 | 95 | } |
97 | 96 |
|
98 | | - service { "${unit_name}.timer": |
| 97 | + service { "${title}.timer": |
99 | 98 | ensure => $service_ensure, |
100 | 99 | enable => $service_ensure, |
101 | 100 | } |
102 | 101 |
|
103 | 102 | if $ensure == 'present' { |
104 | | - Systemd::Manage_unit["${unit_name}.service"] |
105 | | - -> Systemd::Manage_unit["${unit_name}.timer"] |
106 | | - -> Service["${unit_name}.timer"] |
| 103 | + Systemd::Manage_unit["${title}.service"] |
| 104 | + -> Systemd::Manage_unit["${title}.timer"] |
| 105 | + -> Service["${title}.timer"] |
107 | 106 | } else { |
108 | 107 | # Ensure the timer is stopped and disabled before the service |
109 | | - Service["${unit_name}.timer"] |
110 | | - -> Systemd::Manage_unit["${unit_name}.timer"] |
111 | | - -> Systemd::Manage_unit["${unit_name}.service"] |
| 108 | + Service["${title}.timer"] |
| 109 | + -> Systemd::Manage_unit["${title}.timer"] |
| 110 | + -> Systemd::Manage_unit["${title}.service"] |
112 | 111 | } |
113 | 112 | } |
0 commit comments