From 4ac46ab4b31d928e1e8002dc75842bf6cb49ecb0 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 1 Jul 2021 17:28:41 -0400
Subject: bitwardenrs was renamed to vaultwarden

---
 modules/bitwarden/manifests/server.pp           | 18 +++++++++---------
 modules/bitwarden/templates/bitwarden.service   | 11 -----------
 modules/bitwarden/templates/vaultwarden.service | 11 +++++++++++
 3 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 modules/bitwarden/templates/bitwarden.service
 create mode 100644 modules/bitwarden/templates/vaultwarden.service

(limited to 'modules/bitwarden')

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
-- 
cgit v1.2.3-54-g00ecf