diff options
| -rw-r--r-- | manifests/tozt.pp | 2 | ||||
| -rw-r--r-- | modules/bitwarden/manifests/server.pp | 10 | ||||
| -rw-r--r-- | modules/bitwarden/templates/bitwarden.service | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/manifests/tozt.pp b/manifests/tozt.pp index 448b8f1..6d327c8 100644 --- a/manifests/tozt.pp +++ b/manifests/tozt.pp @@ -6,7 +6,7 @@ node 'tozt', 'tozt.localdomain' { class { 'base': extra_script => " (cd /home/doy/coding/metabase-utils && git pull) - (sudo docker pull bitwardenrs/server) + (sudo podman pull docker.io/bitwardenrs/server) "; } diff --git a/modules/bitwarden/manifests/server.pp b/modules/bitwarden/manifests/server.pp index 808ffe1..79809ec 100644 --- a/modules/bitwarden/manifests/server.pp +++ b/modules/bitwarden/manifests/server.pp @@ -1,14 +1,14 @@ class bitwarden::server($data_dir) { - include docker + include podman include systemd $admin_token = secret::value('bitwarden_admin_token') $smtp_password = secret::value('bitwarden_smtp_password') - exec { "docker pull bitwardenrs/server:latest": + exec { "podman pull docker.io/bitwardenrs/server:latest": provider => "shell", - unless => "docker ps | grep -q bitwardenrs", - require => Service["docker"]; + unless => "podman ps | grep -q bitwardenrs", + require => Package["podman"]; } file { $data_dir: @@ -23,7 +23,7 @@ class bitwarden::server($data_dir) { ensure => running, enable => true, require => [ - Exec["docker pull bitwardenrs/server:latest"], + Exec["podman pull docker.io/bitwardenrs/server:latest"], Systemd::Service["bitwarden"], ] } diff --git a/modules/bitwarden/templates/bitwarden.service b/modules/bitwarden/templates/bitwarden.service index 4bb3f13..7b20994 100644 --- a/modules/bitwarden/templates/bitwarden.service +++ b/modules/bitwarden/templates/bitwarden.service @@ -3,8 +3,8 @@ Description=runs bitwarden After=network.target [Service] -ExecStart=/usr/bin/docker run --rm --name bitwarden -e DOMAIN=https://bitwarden.tozt.net -e ADMIN_TOKEN=<%= @admin_token %> -e SIGNUPS_ALLOWED=false -e SMTP_HOST=mail.tozt.net -e SMTP_FROM=bitwarden-noreply@tozt.net -e SMTP_PORT=587 -e SMTP_SSL=true -e SMTP_USERNAME=bitwarden-noreply@tozt.net -e SMTP_PASSWORD=<%= @smtp_password %> -v <%= @data_dir %>:/data/ -p 127.0.0.1:8080:80 bitwardenrs/server:latest -ExecStop=/usr/bin/docker stop bitwarden +ExecStart=/usr/bin/podman run --rm --name bitwarden -e DOMAIN=https://bitwarden.tozt.net -e ADMIN_TOKEN=<%= @admin_token %> -e SIGNUPS_ALLOWED=false -e SMTP_HOST=mail.tozt.net -e SMTP_FROM=bitwarden-noreply@tozt.net -e SMTP_PORT=587 -e SMTP_SSL=true -e SMTP_USERNAME=bitwarden-noreply@tozt.net -e SMTP_PASSWORD=<%= @smtp_password %> -v <%= @data_dir %>:/data/ -p 127.0.0.1:8080:80 bitwardenrs/server:latest +ExecStop=/usr/bin/podman stop bitwarden Restart=always [Install] |