diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-06-20 00:20:22 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-06-20 00:27:16 +0200 |
| commit | fd43ae45333150dd04fd8cbb91694746ed655837 (patch) | |
| tree | 0f74c01fbdc0b7f4348185bb07b828e80ae40a41 | |
| parent | Rewrote almost everything. (diff) | |
| download | concourse-fd43ae45333150dd04fd8cbb91694746ed655837.tar.gz concourse-fd43ae45333150dd04fd8cbb91694746ed655837.tar.xz | |
Replace systemd::manage_dropin with systemd::dropin_file.
manage_dropin was added by puppet-systemd 4.0.0, which is currently in
the future for this module. Revert this commit once the dependency is
updated.
| -rw-r--r-- | manifests/auth/ldap.pp | 15 | ||||
| -rw-r--r-- | manifests/auth/local.pp | 15 |
2 files changed, 18 insertions, 12 deletions
diff --git a/manifests/auth/ldap.pp b/manifests/auth/ldap.pp index 70df4a8..06c1498 100644 --- a/manifests/auth/ldap.pp +++ b/manifests/auth/ldap.pp @@ -114,11 +114,14 @@ class concourse::auth::ldap ( mode => '0600', } - systemd::manage_dropin { 'concourse-ldap-auth': - ensure => $ensure, - unit => $concourse::web::service_unit, - service_entry => { - 'EnvironmentFile' => $env_file, - }, + $dropin_content = @("EOF") + [Service] + EnvironmentFile=${env_file} + | EOF + + systemd::dropin_file { 'concourse-ldap-auth': + ensure => $ensure, + unit => $concourse::web::service_unit, + content => $dropin_content, } } diff --git a/manifests/auth/local.pp b/manifests/auth/local.pp index bc15dad..361ada7 100644 --- a/manifests/auth/local.pp +++ b/manifests/auth/local.pp @@ -40,11 +40,14 @@ class concourse::auth::local ( mode => '0600', } - systemd::manage_dropin { 'concourse-local-auth': - ensure => $ensure, - unit => $concourse::web::service_unit, - service_entry => { - 'EnvironmentFile' => $env_file, - }, + $dropin_content = @("EOF") + [Service] + EnvironmentFile=${env_file} + | EOF + + systemd::dropin_file { 'concourse-local-auth': + ensure => $ensure, + unit => $concourse::web::service_unit, + content => $dropin_content, } } |