diff options
| author | Jesse Luehrs <doy@tozt.net> | 2021-07-22 20:03:12 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2021-07-22 20:03:12 -0400 |
| commit | 8d3d4e45e27f9b8d12fcc6139cbec959cfc3aedc (patch) | |
| tree | 90977c89c9dec2f4cd45fabaea379980d39d2082 /modules/mail | |
| parent | 151ba4b71bc5ea7b79c39a3008ae5b1f7c9cd136 (diff) | |
| download | puppet-tozt-8d3d4e45e27f9b8d12fcc6139cbec959cfc3aedc.tar.gz puppet-tozt-8d3d4e45e27f9b8d12fcc6139cbec959cfc3aedc.zip | |
use podman for mailu too
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/files/learn_spam | 12 | ||||
| -rw-r--r-- | modules/mail/files/mailu.service | 4 | ||||
| -rw-r--r-- | modules/mail/manifests/mailu.pp | 9 |
3 files changed, 14 insertions, 11 deletions
diff --git a/modules/mail/files/learn_spam b/modules/mail/files/learn_spam index ccdc999..cc075f3 100644 --- a/modules/mail/files/learn_spam +++ b/modules/mail/files/learn_spam @@ -18,11 +18,11 @@ container_spam="${container_dir}/spam" find /media/persistent/mail -type f -mtime -30 | grep /cur/ | grep -v Sent | grep -v Junk | xargs -i ln {} "${dir}/ham" find /media/persistent/mail -type f -mtime -30 | grep /cur/ | grep -v Sent | grep Junk | xargs -i ln {} "${dir}/spam" -docker-compose exec imap rspamc -h antispam:11334 -P mailu learn_ham "$container_ham" > /dev/null || true -docker-compose exec imap rspamc -h antispam:11334 -P mailu learn_spam "$container_spam" > /dev/null || true +podman-compose exec imap rspamc -h antispam:11334 -P mailu learn_ham "$container_ham" >/dev/null || true +podman-compose exec imap rspamc -h antispam:11334 -P mailu learn_spam "$container_spam" >/dev/null || true -docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 13 fuzzy_add "$container_ham" > /dev/null || true -docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 11 fuzzy_del "$container_ham" > /dev/null || true +podman-compose exec imap rspamc -h antispam:11334 -P mailu -f 13 fuzzy_add "$container_ham" >/dev/null || true +podman-compose exec imap rspamc -h antispam:11334 -P mailu -f 11 fuzzy_del "$container_ham" >/dev/null || true -docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 11 fuzzy_add "$container_spam" > /dev/null || true -docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 13 fuzzy_del "$container_spam" > /dev/null || true +podman-compose exec imap rspamc -h antispam:11334 -P mailu -f 11 fuzzy_add "$container_spam" >/dev/null || true +podman-compose exec imap rspamc -h antispam:11334 -P mailu -f 13 fuzzy_del "$container_spam" >/dev/null || true diff --git a/modules/mail/files/mailu.service b/modules/mail/files/mailu.service index 14fdd93..dc33d91 100644 --- a/modules/mail/files/mailu.service +++ b/modules/mail/files/mailu.service @@ -3,8 +3,8 @@ Description = runs mailu After=network.target [Service] -ExecStart=/usr/bin/docker-compose up -ExecStop=/usr/bin/docker-compose down +ExecStart=/usr/bin/podman-compose up +ExecStop=/usr/bin/podman-compose down Restart=always WorkingDirectory=/media/persistent diff --git a/modules/mail/manifests/mailu.pp b/modules/mail/manifests/mailu.pp index 169b9d9..f15006c 100644 --- a/modules/mail/manifests/mailu.pp +++ b/modules/mail/manifests/mailu.pp @@ -1,6 +1,6 @@ class mail::mailu { include mail::persistent - include docker + include podman::compose package { "opendkim": ensure => installed; @@ -92,12 +92,15 @@ class mail::mailu { } exec { "compile sieve scripts": - command => "/usr/bin/docker-compose exec -T -u mail imap sievec /overrides/sieve/filters.sieve", + command => "/usr/bin/podman-compose exec -T -u mail imap sievec /overrides/sieve/filters.sieve", cwd => "/media/persistent", refreshonly => true, tries => 12, try_sleep => 15, - require => Service["mailu"]; + require => [ + Package::Makepkg['podman-compose-git'], + Service["mailu"], + ]; } systemd::service { "mailu": |