From 0169227af6057b337e382b59925c03445b88c559 Mon Sep 17 00:00:00 2001
From: Tianyu Liu <liu.tianyu93@hotmail.com>
Date: Fri, 2 May 2025 20:39:28 +0200
Subject: [PATCH] move acme out, change vw deploy

---
 {vaultwarden => acme}/acme.sh |  0
 acme/env.sh                   |  7 +++++++
 vaultwarden/deploy.sh         | 23 ++++++++++++-----------
 3 files changed, 19 insertions(+), 11 deletions(-)
 rename {vaultwarden => acme}/acme.sh (100%)
 create mode 100644 acme/env.sh

diff --git a/vaultwarden/acme.sh b/acme/acme.sh
similarity index 100%
rename from vaultwarden/acme.sh
rename to acme/acme.sh
diff --git a/acme/env.sh b/acme/env.sh
new file mode 100644
index 0000000..1049c8c
--- /dev/null
+++ b/acme/env.sh
@@ -0,0 +1,7 @@
+export NAMECHEAP_USERNAME=""
+export NAMECHEAP_API_KEY=""
+export NAMECHEAP_SOURCEIP=""
+
+export EMAIL=""
+export DOMAIN=""
+export SSL_PATH=$HOME/.config/ssl/$DOMAIN
\ No newline at end of file
diff --git a/vaultwarden/deploy.sh b/vaultwarden/deploy.sh
index c8db8e8..9ceb8ad 100755
--- a/vaultwarden/deploy.sh
+++ b/vaultwarden/deploy.sh
@@ -5,17 +5,17 @@ set -e
 
 mkdir -p $DATA_FOLDER
 
-if systemctl --user list-units --full --all | grep -q "container-${CONTAINER_NAME}.service"; then
-  systemctl --user stop container-${CONTAINER_NAME}.service
+if systemctl --user list-units --full --all | grep -q "vaultwarden-${CONTAINER_NAME}.service"; then
+  systemctl --user stop vaultwarden-${CONTAINER_NAME}.service
 fi
 
-# if podman container exists "$CONTAINER_NAME"; then
-#     echo "Stop and delete existing container $CONTAINER_NAME"
-#     if podman inspect -f '{{.State.Running}}' "$CONTAINER_NAME" | grep -q true; then
-#         podman stop "$CONTAINER_NAME"
-#     fi
-#     podman rm "$CONTAINER_NAME"
-# fi
+if podman container exists "$CONTAINER_NAME"; then
+    echo "Stop and delete existing container $CONTAINER_NAME"
+    if podman inspect -f '{{.State.Running}}' "$CONTAINER_NAME" | grep -q true; then
+        podman stop "$CONTAINER_NAME"
+    fi
+    podman rm "$CONTAINER_NAME"
+fi
 
 podman create \
     --name vaultwarden \
@@ -30,13 +30,14 @@ podman generate systemd \
     --new \
     --name $CONTAINER_NAME \
     --files \
+    --container-prefix=vaultwarden \
     --restart-policy=always
 
 USER_SYSTEMD="$HOME/.config/systemd/user"
 mkdir -p $USER_SYSTEMD
-cp container-$CONTAINER_NAME.service $USER_SYSTEMD
+cp vaultwarden-$CONTAINER_NAME.service $USER_SYSTEMD
 systemctl --user daemon-reload
-systemctl --user enable --now container-$CONTAINER_NAME.service
+systemctl --user enable --now vaultwarden-$CONTAINER_NAME.service
 
 sudo loginctl enable-linger $USER