From 49ae2e588126520bc379379fc187338139f84f68 Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Sun, 2 Mar 2025 21:15:04 -0800
Subject: [PATCH] vaultwarden and redis updated

---
 redis/README.md                |  3 +--
 redis/sample-extends.yml       |  7 -------
 vaultwarden/docker-compose.yml | 18 ++++++++----------
 vaultwarden/sample-extends.yml |  7 -------
 wallabag/sample-extends.yml    | 17 -----------------
 5 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 redis/sample-extends.yml
 delete mode 100644 vaultwarden/sample-extends.yml
 delete mode 100644 wallabag/sample-extends.yml

diff --git a/redis/README.md b/redis/README.md
index 225bad5..bf9d4e1 100644
--- a/redis/README.md
+++ b/redis/README.md
@@ -1,6 +1,5 @@
 # redis
 
-Last Updated: Sat August 17, 2024 14:55:08 PDT
-
 ## Overview
+
 Docker Hub: https://hub.docker.com/_/redis
diff --git a/redis/sample-extends.yml b/redis/sample-extends.yml
deleted file mode 100644
index fac0b30..0000000
--- a/redis/sample-extends.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: '3.4'
-
-services:
-  redis:
-    extends:
-      file: ${COOKBOOK}/redis/docker-compose.yml
-      service: redis
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index 172eed3..1e57288 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -5,15 +5,13 @@ services:
     environment:
       WEBSOCKET_ENABLED: "${VAULT_WEBSOCKET_ENABLED:-true}" # Enable WebSocket notifications
       SIGNUPS_ALLOWED: "${VAULT_SIGNUPS_ALLOWED:-false}" # Disable new user signups
-      DOMAIN: ${VAULT_DOMAIN}
-      ADMIN_TOKEN: "${VAULT_ADMIN_TOKEN}"
-      SMTP_HOST: ${SMTP_HOST}
-      SMTP_FROM: ${SMTP_FROM}
-      SMTP_PORT: ${SMTP_PORT}
-      SMTP_SECURITY: ${SMTP_SECURITY}
-      SMTP_USERNAME: ${SMTP_USERNAME}
-      SMTP_PASSWORD: ${SMTP_PASSWORD}
+      DOMAIN: ${VAULT_DOMAIN:-example.com}
+      ADMIN_TOKEN: "${VAULT_ADMIN_TOKEN:-changeme}"
+      SMTP_HOST: ${SMTP_HOST:-smtp.example.com}
+      SMTP_FROM: ${SMTP_FROM:-no-reply@example.com}
+      SMTP_PORT: ${SMTP_PORT:-587}
+      SMTP_SECURITY: ${SMTP_SECURITY:-tls}
+      SMTP_USERNAME: ${SMTP_USERNAME:-smtp_user@example.com}
+      SMTP_PASSWORD: ${SMTP_PASSWORD:-SuperSecretPassword123}
     volumes:
       - "${VOL_PATH:-./data}/vault-data:/data"
-
-
diff --git a/vaultwarden/sample-extends.yml b/vaultwarden/sample-extends.yml
deleted file mode 100644
index c399490..0000000
--- a/vaultwarden/sample-extends.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: '3.4'
-
-services:
-	vaultwarden:
-		extends:
-			file: ${COOKBOOK}/vaultwarden/docker-compose.yml
-			service: vaultwarden
\ No newline at end of file
diff --git a/wallabag/sample-extends.yml b/wallabag/sample-extends.yml
deleted file mode 100644
index db50fe7..0000000
--- a/wallabag/sample-extends.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3.4'
-
-services:
-  wallabag:
-    extends:
-      file: ${COOKBOOK}/wallabag/docker-compose.yml
-      service: wallabag
-
-	wallabag-mariadb:
-		extends:
-			file: ${COOKBOOK}/mariadb/docker-compose.yml
-			service: mariadb
-  
-  wallbag-redis:
-    	extends:
-			  file: ${COOKBOOK}/redis/docker-compose.yml
-			  service: redis