Fix vapid private key configuration

.env.sample

@@ -5,7 +5,7 @@ DOMAIN=karrot.example.com
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_SECRET_KEY_VERSION=v1
 SECRET_SMTP_PASSWORD_VERSION=v1
-SECRET_VAPID_SECRET_KEY_VERSION=v1
+SECRET_VAPID_PRIVATE_KEY_VERSION=v1
 
 # account id for maxmind (for GeoIP)
 #MAXMIND_ACCOUNT_ID=

compose.yml

@@ -52,7 +52,7 @@ services:
       - secret_key
       - maxmind_license_key
       - smtp_password
-      - vapid_secret_key
+      - vapid_private_key
     volumes:
       - "shiv_data:/root/.shiv"
       - "geoip_data:/var/lib/GeoIP"
@@ -94,7 +94,7 @@ services:
       - SMTP_USE_TLS
       - SMTP_USER
       - VAPID_PUBLIC_KEY
-      - VAPID_SECRET_KEY_FILE=/run/secrets/vapid_secret_key
+      - VAPID_PRIVATE_KEY_FILE=/run/secrets/vapid_private_key
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8000/api/config/"]
       interval: 10s
@@ -125,7 +125,7 @@ services:
       - db_password
       - secret_key
       - smtp_password
-      - vapid_secret_key
+      - vapid_private_key
     environment:
       - DATABASE_CONN_MAX_AGE
       - DATABASE_HOST=db
@@ -157,7 +157,7 @@ services:
       - SMTP_USE_TLS
       - SMTP_USER
       - VAPID_PUBLIC_KEY
-      - VAPID_SECRET_KEY_FILE=/run/secrets/vapid_secret_key
+      - VAPID_PRIVATE_KEY_FILE=/run/secrets/vapid_private_key
 
   redis:
     image: "redis:6-alpine"
@@ -217,9 +217,9 @@ secrets:
   smtp_password:
     external: true
     name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
-  vapid_secret_key:
+  vapid_private_key:
     external: true
-    name: ${STACK_NAME}_vapid_secret_key_${SECRET_VAPID_SECRET_KEY_VERSION}
+    name: ${STACK_NAME}_vapid_private_key_${SECRET_VAPID_PRIVATE_KEY_VERSION}
 
 volumes:
   shiv_data:

entrypoint.sh

@@ -27,6 +27,6 @@ file_env() {
 file_env DATABASE_PASSWORD
 file_env SECRET_KEY
 file_env SMTP_PASSWORD
-file_env VAPID_SECRET_KEY
+file_env VAPID_PRIVATE_KEY
 
 /docker-entrypoint.sh