install.sh

@@ -5,8 +5,9 @@ set -euo pipefail
 # CONFIG
 #############################
 
-# Use the CURRENT directory
-BASE_DIR="$(pwd)"
+# Run this script from /home/Dejan/Docker
+# It will create /home/Dejan/Docker/Vaultwarden
+BASE_DIR="$(pwd)/Vaultwarden"
 DOMAIN_DEFAULT="https://vaultwarden.rozic-dev.com"
 TZ_DEFAULT="Europe/Ljubljana"
 
@@ -29,27 +30,37 @@ generate_admin_token() {
   if command -v openssl &>/dev/null; then
     openssl rand -hex 32
   else
+    # Fallback if openssl isn’t available
     tr -dc 'A-Za-z0-9' </dev/urandom | head -c 64
   fi
 }
 
 #############################
-# MAIN START
+# MAIN
 #############################
 
-echo ">>> Running install inside: ${BASE_DIR}"
+# Optional safety: ensure we’re in /home/Dejan/Docker
+if [[ "$(pwd)" != "/home/Dejan/Docker" ]]; then
+  echo "Please run this script from /home/Dejan/Docker"
+  echo "Current directory: $(pwd)"
+  exit 1
+fi
+
+echo ">>> Creating Vaultwarden directory at: ${BASE_DIR}"
+mkdir -p "${BASE_DIR}"
+cd "${BASE_DIR}"
 
 #############################
 # .env FILE
 #############################
 
 if [[ -f .env ]]; then
-  echo ">>> .env already exists → loading values."
+  echo ">>> .env already exists, reusing existing values."
   # shellcheck disable=SC1091
   source .env
-  : "${ADMIN_TOKEN:?ADMIN_TOKEN missing in .env}"
-  : "${DOMAIN:?DOMAIN missing in .env}"
-  : "${TZ:?TZ missing in .env}"
+  : "${ADMIN_TOKEN:?ADMIN_TOKEN must be set in .env}"
+  : "${DOMAIN:?DOMAIN must be set in .env}"
+  : "${TZ:?TZ must be set in .env}"
 else
   echo ">>> Creating .env file..."
 
@@ -64,7 +75,7 @@ TZ=${TZ}
 EOF
 
   echo ">>> .env created."
-  echo "    ADMIN_TOKEN: ${ADMIN_TOKEN}"
+  echo "    ADMIN_TOKEN (keep this secret!): ${ADMIN_TOKEN}"
   echo "    DOMAIN: ${DOMAIN}"
   echo "    TZ: ${TZ}"
 fi
@@ -84,13 +95,16 @@ services:
     container_name: vaultwarden
     restart: unless-stopped
     environment:
+      # Base configuration
       - DOMAIN=${DOMAIN}
       - TZ=${TZ}
       - WEBSOCKET_ENABLED=true
+
+      # Security
       - SIGNUPS_ALLOWED=false
       - ADMIN_TOKEN=${ADMIN_TOKEN}
 
-      # Optional logging
+      # Logging (optional)
       - LOG_FILE=/data/vaultwarden.log
       - LOG_LEVEL=info
 
@@ -103,7 +117,7 @@ services:
     labels:
       - "traefik.enable=true"
 
-      # MAIN HTTPS ROUTER
+      # MAIN HTTP(S) APP
       - "traefik.http.routers.vaultwarden.rule=Host(`vaultwarden.rozic-dev.com`)"
       - "traefik.http.routers.vaultwarden.entrypoints=web,websecure"
       - "traefik.http.routers.vaultwarden.middlewares=redirect-to-https"
@@ -111,7 +125,7 @@ services:
       - "traefik.http.routers.vaultwarden.tls.certresolver=letsencrypt"
       - "traefik.http.services.vaultwarden.loadbalancer.server.port=80"
 
-      # WEBSOCKET ROUTER
+      # WEBSOCKET FOR LIVE UPDATES
       - "traefik.http.routers.vaultwarden-ws.rule=Host(`vaultwarden.rozic-dev.com`) && Path(`/notifications/hub`)"
       - "traefik.http.routers.vaultwarden-ws.entrypoints=web,websecure"
       - "traefik.http.routers.vaultwarden-ws.middlewares=redirect-to-https"
@@ -131,7 +145,7 @@ echo ">>> docker-compose.yml created."
 #############################
 
 DC_CMD=$(choose_docker_compose_cmd)
-echo ">>> Using: ${DC_CMD}"
+echo ">>> Using Docker command: ${DC_CMD}"
 
 echo ">>> Pulling images..."
 ${DC_CMD} pull
@@ -139,8 +153,9 @@ ${DC_CMD} pull
 echo ">>> Starting Vaultwarden..."
 ${DC_CMD} up -d
 
-echo ">>> Installation completed!"
-echo "URL: ${DOMAIN}"
-echo "Admin: ${DOMAIN}/admin"
-echo "Admin token (also saved in .env): ${ADMIN_TOKEN}"
-echo "Data directory: ${BASE_DIR}/vw-data"
+echo ">>> Done!"
+echo "Vaultwarden should be available at: ${DOMAIN}"
+echo "Admin interface: ${DOMAIN}/admin"
+echo "Admin token (from .env): ${ADMIN_TOKEN}"
+echo "Data dir: ${BASE_DIR}/vw-data"
+echo "Don't forget to backup ${BASE_DIR}/vw-data and ${BASE_DIR}/.env regularly."