add .gitignore

vaultwarden: fix env variable

vaultwarden: enable email

vaultwarden: change push notification keys

vaultwarden: actually include env file

vaultwarden

.gitignore

@@ -0,0 +1 @@
+git-crypt-key

docker-compose.yml

@@ -133,7 +133,7 @@ services:
 
   mealie:
     container_name: mealie
-    image: hkotel/mealie:v1.5.1
+    image: hkotel/mealie:v1.9.0
     environment:
       PUID: ${PUID}
       PGID: ${PGID}
@@ -533,18 +533,28 @@ services:
   #     - public
 
   vaultwarden:
-    image: vaultwarden/server:latest
+    image: vaultwarden/server:1.31.0
     container_name: vaultwarden
     networks:
       public:
         ipv4_address: 192.168.240.29
     ports:
       - "${VAULTWARDEN_EXTERNAL_PORT}:${VAULTWARDEN_INTERNAL_PORT}"
+    env_file:
+      - ./secrets/vaultwarden.env
     environment:
-            #- PUSH_ENABLED=true
-            #- PUSH_INSTALLATION='287eaff9-7be7-4b52-a31d-b09100dc0f5c'
-            #- PUSH_INSTALLATION_KEY='n0xrH7YORuvJk8rqvxB5'
-       - ADMIN_TOKEN=$$argon2id$$v=19$$m=65540,t=3,p=4$$aWJ2cVRvYUsySkM3M01TMTJJMnZqbUF0Wm1qRWhvd1B6Sk50Q1hwck96dz0$$FKjZ36E54pX2e0AE9OaDpiH43TyAyfVwr3IvracbqEA
+      - PUSH_ENABLED=true
+      # PUSH_INSTALLATION_ID=
+      # PUSH_INSTALLATION_KEY=
+      - PUSH_RELAY_URI=https://api.bitwarden.eu
+      - PUSH_IDENTITY_URI=https://identity.bitwarden.eu
+      - ADMIN_TOKEN=$$argon2id$$v=19$$m=65540,t=3,p=4$$aWJ2cVRvYUsySkM3M01TMTJJMnZqbUF0Wm1qRWhvd1B6Sk50Q1hwck96dz0$$FKjZ36E54pX2e0AE9OaDpiH43TyAyfVwr3IvracbqEA
+      - SMTP_HOST=${EMAIL_HOST}
+      - SMTP_FROM=${EMAIL_FROM}
+      - SMTP_FROM_NAME="Bitwarden (bw.kucharczyk.xyz)"
+      - SMTP_PORT=${EMAIL_PORT}
+      - SMTP_USERNAME=${EMAIL_FROM}
+      - SMTP_PASSWORD=${EMAIL_PASSWORD}
     volumes:
       - ${DOCKER_STORAGE_PATH}/vaultwarden:/data
     restart: unless-stopped