Merge 281283b12d into ce6859648a

app/Models/PrivateKey.php

@@ -237,7 +237,7 @@ class PrivateKey extends BaseModel
         $testSuccess = $disk->put($testFilename, 'test');
 
         if (! $testSuccess) {
-            throw new \Exception('SSH keys storage directory is not writable');
+            throw new \Exception('SSH keys storage directory is not writable. Run on the host: sudo chown -R 9999 /data/coolify/ssh && sudo chmod -R 700 /data/coolify/ssh && docker restart coolify');
         }
 
         // Clean up test file

scripts/upgrade.sh

@@ -141,6 +141,15 @@ else
     log "Network 'coolify' already exists"
 fi
 
+# Fix SSH directory ownership if not owned by container user UID 9999 (fixes #6621)
+# Only changes owner — preserves existing group to respect custom setups
+SSH_OWNER=$(stat -c '%u' /data/coolify/ssh 2>/dev/null || echo "unknown")
+if [ "$SSH_OWNER" != "9999" ]; then
+    log "Fixing SSH directory ownership (was owned by UID $SSH_OWNER)"
+    chown -R 9999 /data/coolify/ssh
+    chmod -R 700 /data/coolify/ssh
+fi
+
 # Check if Docker config file exists
 DOCKER_CONFIG_MOUNT=""
 if [ -f /root/.docker/config.json ]; then

templates/compose/grist.yaml

@@ -3,16 +3,16 @@
 # category: productivity
 # tags: lowcode, nocode, spreadsheet, database, relational
 # logo: svgs/grist.svg
-# port: 443
+# port: 8484
 
 services:
   grist:
     image: gristlabs/grist:latest
     environment:
-      - SERVICE_URL_GRIST_443
+      - SERVICE_URL_GRIST_8484
       - APP_HOME_URL=${SERVICE_URL_GRIST}
       - APP_DOC_URL=${SERVICE_URL_GRIST}
-      - GRIST_DOMAIN=${SERVICE_URL_GRIST}
+      - GRIST_DOMAIN=${SERVICE_FQDN_GRIST}
       - TZ=${TZ:-UTC}
       - GRIST_SUPPORT_ANON=${SUPPORT_ANON:-false}
       - GRIST_FORCE_LOGIN=${FORCE_LOGIN:-true}
@@ -20,7 +20,7 @@ services:
       - GRIST_PAGE_TITLE_SUFFIX=${PAGE_TITLE_SUFFIX:- - Suffix}
       - GRIST_HIDE_UI_ELEMENTS=${HIDE_UI_ELEMENTS:-billing,sendToDrive,supportGrist,multiAccounts,tutorials}
       - GRIST_UI_FEATURES=${UI_FEATURES:-helpCenter,billing,templates,createSite,multiSite,sendToDrive,tutorials,supportGrist}
-      - GRIST_DEFAULT_EMAIL=${DEFAULT_EMAIL:-test@example.com}
+      - GRIST_DEFAULT_EMAIL=${DEFAULT_EMAIL:-?}
       - GRIST_ORG_IN_PATH=${ORG_IN_PATH:-true}
       - GRIST_OIDC_SP_HOST=${SERVICE_URL_GRIST}
       - GRIST_OIDC_IDP_SCOPES=${OIDC_IDP_SCOPES:-openid profile email}
@@ -37,7 +37,7 @@ services:
       - TYPEORM_DATABASE=${POSTGRES_DATABASE:-grist-db}
       - TYPEORM_USERNAME=${SERVICE_USER_POSTGRES}
       - TYPEORM_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
-      - TYPEORM_HOST=${TYPEORM_HOST}
+      - TYPEORM_HOST=${TYPEORM_HOST:-postgres}
       - TYPEORM_PORT=${TYPEORM_PORT:-5432}
       - TYPEORM_LOGGING=${TYPEORM_LOGGING:-false}
       - REDIS_URL=${REDIS_URL:-redis://redis:6379}

tests/Unit/PrivateKeyStorageTest.php

@@ -112,7 +112,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             );
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('SSH keys storage directory is not writable');
+        $this->expectExceptionMessage('SSH keys storage directory is not writable. Run on the host: sudo chown -R 9999 /data/coolify/ssh && sudo chmod -R 700 /data/coolify/ssh && docker restart coolify');
 
         PrivateKey::createAndStore([
             'name' => 'Test Key',