diff options
| author | Jesse Luehrs <doy@tozt.net> | 2021-07-01 17:28:41 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2021-07-01 17:28:41 -0400 |
| commit | 4ac46ab4b31d928e1e8002dc75842bf6cb49ecb0 (patch) | |
| tree | fe201e3acbe96f1af4d5e82386188373ca070bb1 | |
| parent | e8d340e11a2177958e10781a33676c0e2ba6d661 (diff) | |
| download | puppet-tozt-4ac46ab4b31d928e1e8002dc75842bf6cb49ecb0.tar.gz puppet-tozt-4ac46ab4b31d928e1e8002dc75842bf6cb49ecb0.zip | |
bitwardenrs was renamed to vaultwarden
| -rw-r--r-- | manifests/tozt.pp | 2 | ||||
| -rw-r--r-- | modules/bitwarden/manifests/server.pp | 18 | ||||
| -rw-r--r-- | modules/bitwarden/templates/bitwarden.service | 11 | ||||
| -rw-r--r-- | modules/bitwarden/templates/vaultwarden.service | 11 |
4 files changed, 21 insertions, 21 deletions
diff --git a/manifests/tozt.pp b/manifests/tozt.pp index 6d327c8..a213e35 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 podman pull docker.io/bitwardenrs/server) + (sudo podman pull docker.io/vaultwarden/server) "; } diff --git a/modules/bitwarden/manifests/server.pp b/modules/bitwarden/manifests/server.pp index 79809ec..cea8d0b 100644 --- a/modules/bitwarden/manifests/server.pp +++ b/modules/bitwarden/manifests/server.pp @@ -2,12 +2,12 @@ class bitwarden::server($data_dir) { include podman include systemd - $admin_token = secret::value('bitwarden_admin_token') - $smtp_password = secret::value('bitwarden_smtp_password') + $admin_token = secret::value('vaultwarden_admin_token') + $smtp_password = secret::value('vaultwarden_smtp_password') - exec { "podman pull docker.io/bitwardenrs/server:latest": + exec { "podman pull docker.io/vaultwarden/server:latest": provider => "shell", - unless => "podman ps | grep -q bitwardenrs", + unless => "podman ps | grep -q vaultwarden", require => Package["podman"]; } @@ -15,16 +15,16 @@ class bitwarden::server($data_dir) { ensure => directory; } - systemd::service { "bitwarden": - content => template("bitwarden/bitwarden.service"), + systemd::service { "vaultwarden": + content => template("bitwarden/vaultwarden.service"), } - service { "bitwarden": + service { "vaultwarden": ensure => running, enable => true, require => [ - Exec["podman pull docker.io/bitwardenrs/server:latest"], - Systemd::Service["bitwarden"], + Exec["podman pull docker.io/vaultwarden/server:latest"], + Systemd::Service["vaultwarden"], ] } } diff --git a/modules/bitwarden/templates/bitwarden.service b/modules/bitwarden/templates/bitwarden.service deleted file mode 100644 index 7b20994..0000000 --- a/modules/bitwarden/templates/bitwarden.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=runs bitwarden -After=network.target - -[Service] -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] -WantedBy=default.target diff --git a/modules/bitwarden/templates/vaultwarden.service b/modules/bitwarden/templates/vaultwarden.service new file mode 100644 index 0000000..4b525a8 --- /dev/null +++ b/modules/bitwarden/templates/vaultwarden.service @@ -0,0 +1,11 @@ +[Unit] +Description=runs vaultwarden +After=network.target + +[Service] +ExecStart=/usr/bin/podman run --rm --name vaultwarden -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 docker.io/vaultwarden/server:latest +ExecStop=/usr/bin/podman stop vaultwarden +Restart=always + +[Install] +WantedBy=default.target |