Resolve merge conflicts with updated version 0.1.79

start.sh

@@ -136,13 +136,19 @@ email:
   port: ${CLOUDRON_MAIL_SMTP_PORT:-25}
   username: "${CLOUDRON_MAIL_SMTP_USERNAME:-}"
   password: "${CLOUDRON_MAIL_SMTP_PASSWORD:-}"
-  from: "${CLOUDRON_MAIL_FROM:-no-reply@${CLOUDRON_APP_FQDN:-localhost}}"
+  from: "${CLOUDRON_MAIL_FROM:-no-reply@${CLOUDRON_APP_DOMAIN:-localhost}}"
 
 # WebAuthn configuration for passkey support
 webauthn:
-  rpid: "${CLOUDRON_APP_FQDN:-localhost}"
+  rpid: "${CLOUDRON_APP_DOMAIN:-localhost}"
   rporigins:
-    - "https://${CLOUDRON_APP_FQDN:-localhost}"
+    - "https://${CLOUDRON_APP_DOMAIN:-localhost}"
+
+# Additional Museum server configuration
+http:
+  allowed_hosts:
+    - "${CLOUDRON_APP_DOMAIN:-localhost}"
+  base_url: "https://${CLOUDRON_APP_DOMAIN:-localhost}"
 EOF
   chmod 600 "$MUSEUM_CONFIG"
   log "INFO" "Created Museum configuration at ${MUSEUM_CONFIG}"
@@ -371,7 +377,7 @@ const apiHandlers = {
           token: 'placeholder-jwt-token-' + Date.now(),
           user: {
             id: 1,
-            email: 'placeholder@example.com',
+            email: 'placeholder@' + (process.env.CLOUDRON_APP_DOMAIN || 'localhost'),
             name: 'Placeholder User'
           }
         }));
@@ -400,7 +406,7 @@ const apiHandlers = {
           token: 'placeholder-jwt-token-' + Date.now(),
           user: {
             id: 1,
-            email: 'placeholder@example.com',
+            email: 'placeholder@' + (process.env.CLOUDRON_APP_DOMAIN || 'localhost'),
             name: 'New User'
           }
         }));
@@ -651,10 +657,14 @@ cat > "$CADDY_CONFIG" << EOF
         }
     }
     
-    # Health check endpoint
+    # Health check endpoints
     handle /health {
         reverse_proxy localhost:8080
     }
+    
+    handle /ping {
+        reverse_proxy localhost:8080
+    }
 
     # Static files for Next.js assets from all apps
     handle /_next/* {
@@ -755,10 +765,10 @@ cat > /app/data/SETUP-INSTRUCTIONS.md << EOF
 
 The following web applications are available:
 
-- Photos: https://${CLOUDRON_APP_FQDN}/photos/
-- Accounts: https://${CLOUDRON_APP_FQDN}/accounts/
-- Auth: https://${CLOUDRON_APP_FQDN}/auth/
-- Cast: https://${CLOUDRON_APP_FQDN}/cast/
+- Photos: https://${CLOUDRON_APP_DOMAIN}/photos/
+- Accounts: https://${CLOUDRON_APP_DOMAIN}/accounts/
+- Auth: https://${CLOUDRON_APP_DOMAIN}/auth/
+- Cast: https://${CLOUDRON_APP_DOMAIN}/cast/
 
 ## Support