diff options
| author | Jesse Luehrs <doy@tozt.net> | 2021-07-22 20:37:21 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2021-07-22 20:37:21 -0400 |
| commit | 3257e44002cd62097c70a80368fb0228f0f86809 (patch) | |
| tree | c365c0c834b04dd10bb0f00cfbd8655af1b8551f /modules/mail/manifests/mailu.pp | |
| parent | 3e8ef151e6b1420cbfba304bd71e1116c38e7268 (diff) | |
| download | puppet-tozt-3257e44002cd62097c70a80368fb0228f0f86809.tar.gz puppet-tozt-3257e44002cd62097c70a80368fb0228f0f86809.zip | |
switch back to docker
podman-compose doesn't handle networking properly yet
(https://github.com/containers/podman-compose/issues/119)
Diffstat (limited to 'modules/mail/manifests/mailu.pp')
| -rw-r--r-- | modules/mail/manifests/mailu.pp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/modules/mail/manifests/mailu.pp b/modules/mail/manifests/mailu.pp index f15006c..169b9d9 100644 --- a/modules/mail/manifests/mailu.pp +++ b/modules/mail/manifests/mailu.pp @@ -1,6 +1,6 @@ class mail::mailu { include mail::persistent - include podman::compose + include docker package { "opendkim": ensure => installed; @@ -92,15 +92,12 @@ class mail::mailu { } exec { "compile sieve scripts": - command => "/usr/bin/podman-compose exec -T -u mail imap sievec /overrides/sieve/filters.sieve", + command => "/usr/bin/docker-compose exec -T -u mail imap sievec /overrides/sieve/filters.sieve", cwd => "/media/persistent", refreshonly => true, tries => 12, try_sleep => 15, - require => [ - Package::Makepkg['podman-compose-git'], - Service["mailu"], - ]; + require => Service["mailu"]; } systemd::service { "mailu": |