From 57dd7df17211eb7a8f539748ffc02e0896b6bba3 Mon Sep 17 00:00:00 2001
From: Mac Chaffee <me@macchaffee.com>
Date: Tue, 9 Sep 2025 18:42:45 -0400
Subject: [PATCH] fix: upgrade mariadb and fully disable by default

---
 .env.sample         | 11 ++++++-----
 compose.mariadb.yml |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.env.sample b/.env.sample
index 18fb577..762994b 100644
--- a/.env.sample
+++ b/.env.sample
@@ -19,7 +19,8 @@ CHORUS=false
 FOREST=false
 SINGLE_USER=false
 MAX_BLOGS="10"
-DISABLE_PASSWORD_AUTH=true
+# Set to true if using keycloak
+DISABLE_PASSWORD_AUTH=false
 
 #This is here so later lines can extend it; you likely don't wanna edit
 COMPOSE_FILE="compose.yml"
@@ -28,13 +29,13 @@ COMPOSE_FILE="compose.yml"
 #EXTRA_DOMAINS=', `www.writefreely.example.com`'
 LETS_ENCRYPT_ENV=production
 
-## Uncomment to use mariadb instead of sqlite
+## Uncomment to use MariaDB instead of sqlite
 #COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
 #USE_MARIADB=true
-SECRET_DB_ROOT_PASSWORD_VERSION=v1
-SECRET_DB_PASSWORD_VERSION=v1
+#SECRET_DB_ROOT_PASSWORD_VERSION=v1
+#SECRET_DB_PASSWORD_VERSION=v1
 
-## Set both for keycloak. See README.md for explanation
+## Uncomment to use Keycloak. See README.md for explanation
 #KEYCLOAK_ENABLED=1
 #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
 #OAUTH_CLIENT_ID=writefreely
diff --git a/compose.mariadb.yml b/compose.mariadb.yml
index d0ba70f..90f82b5 100644
--- a/compose.mariadb.yml
+++ b/compose.mariadb.yml
@@ -9,7 +9,7 @@ services:
       - db_password
 
   db:
-    image: "mariadb:10.11"
+    image: "mariadb:12.1"
     environment:
       - MYSQL_DATABASE=writefreely
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password