Auto-configure CLI endpoint

CloudronManifest.json

@@ -7,7 +7,7 @@
   "contactEmail": "contact@ente.io",
   "tagline": "Open Source End-to-End Encrypted Photos & Authentication",
   "upstreamVersion": "1.0.0",
-  "version": "0.1.123",
+  "version": "0.1.133",
   "healthCheckPath": "/ping",
   "httpPort": 3080,
   "memoryLimit": 1073741824,

Dockerfile

@@ -143,6 +143,7 @@ ENV GOFLAGS="-modfile=/app/data/go/go.mod -mod=mod"
 ENV PATH="/usr/local/go/bin:${PATH}"
 ENV GOSUMDB=off
 ENV GOMODCACHE="/app/data/go/pkg/mod"
+ENV HOME=/app/data/home
 
 # Copy the web app built files from the first stage
 COPY --from=web-builder /build/web/photos /app/web/photos
@@ -156,6 +157,12 @@ RUN env GOFLAGS= GOMODCACHE=/tmp/cli-go-cache GO111MODULE=on go build -o /app/co
 
 WORKDIR /app/code
 
+# Symlink CLI into PATH for convenience
+RUN ln -sf /app/code/ente /usr/local/bin/ente
+
+# Prepare CLI data directory symlink to persistent storage
+RUN mkdir -p /app/data/cli-data && ln -s /app/data/cli-data /cli-data
+
 # Copy Museum server binary from builder stage to app directory (not data volume)
 RUN mkdir -p /app/museum-bin
 COPY --from=museum-builder /ente/server/museum /app/museum-bin/museum

POSTINSTALL.md

@@ -23,5 +23,12 @@ Before you can use Ente, you need to configure an S3-compatible storage service:
 ## Ente CLI
 
 - The Ente CLI binary is pre-built at `/app/code/ente` inside the app container.
-- Open the Cloudron web terminal (working directory `/app/code`) and run commands with `./ente ...` or add `/app/code` to your `PATH`.
-- A writable CLI config template lives at `/app/data/home/.ente/config.yaml` for pointing the CLI to your instance.
+- Open the Cloudron web terminal (working directory `/app/code`) and run commands with `ente ...` or `./ente ...`.
+- The CLI configuration at `/app/data/home/.ente/config.yaml` already points to your instance (`https://<your-domain>/api`).
+- CLI state is stored under `/app/data/cli-data/` so re-logins persist.
+
+## Museum Server Configuration
+
+- The active configuration lives at `/app/data/ente/server/configurations/local.yaml` and is created the first time the app starts.
+- Subsequent restarts leave this file untouched, so you can whitelist admin accounts or adjust other settings as documented by Ente.
+- Delete the file to regenerate the default template (environment values such as database and S3 credentials are rendered during creation).

start.sh

@@ -27,6 +27,11 @@ HOME_DIR="/app/data/home"
 export HOME="$HOME_DIR"
 mkdir -p "$HOME"
 
+# Ensure CLI data directory persists across restarts
+CLI_DATA_PERSIST="/app/data/cli-data"
+mkdir -p "$CLI_DATA_PERSIST"
+
+
 # Prevent infinite loops through startup flag
 if [ -f "/app/data/startup_in_progress" ]; then
   if [ "$(find /app/data/startup_in_progress -mmin +2)" ]; then
@@ -148,14 +153,27 @@ fi
 # Seed Ente CLI configuration directory
 ENTE_CLI_CONFIG_DIR="$HOME/.ente"
 ENTE_CLI_CONFIG_FILE="$ENTE_CLI_CONFIG_DIR/config.yaml"
-if [ ! -f "$ENTE_CLI_CONFIG_FILE" ]; then
-  mkdir -p "$ENTE_CLI_CONFIG_DIR"
+if [ -f "$ENTE_CLI_CONFIG_FILE" ] && grep -q "^# Ente CLI configuration" "$ENTE_CLI_CONFIG_FILE"; then
+  rm -f "$ENTE_CLI_CONFIG_FILE"
+fi
+mkdir -p "$ENTE_CLI_CONFIG_DIR"
+write_cli_config_if_needed() {
   cat > "$ENTE_CLI_CONFIG_FILE" << EOF
-# Ente CLI configuration
-# Uncomment and set the host to point the CLI to this Cloudron deployment.
-#host: https://${CLOUDRON_APP_DOMAIN:-localhost}
+endpoint:
+  api: ${BASE_URL%/}/api
+log:
+  http: false
 EOF
   chown -R cloudron:cloudron "$HOME_DIR" || true
+}
+if [ ! -f "$ENTE_CLI_CONFIG_FILE" ]; then
+  write_cli_config_if_needed
+else
+  if ! grep -q "endpoint:" "$ENTE_CLI_CONFIG_FILE" || grep -q "\\n" "$ENTE_CLI_CONFIG_FILE"; then
+    write_cli_config_if_needed
+  elif ! grep -q "${BASE_URL%/}/api" "$ENTE_CLI_CONFIG_FILE"; then
+    write_cli_config_if_needed
+  fi
 fi
 
 S3_ACCESS_KEY="${S3_ACCESS_KEY:-$DEFAULT_S3_ACCESS_KEY}"
@@ -202,8 +220,9 @@ MUSEUM_CONFIG_DIR="/app/data/ente/server/configurations"
 MUSEUM_CONFIG="$MUSEUM_CONFIG_DIR/local.yaml"
 mkdir -p "$MUSEUM_CONFIG_DIR"
 
-log "INFO" "Rendering Museum server configuration"
-cat > "$MUSEUM_CONFIG" << EOF
+if [ ! -f "$MUSEUM_CONFIG" ]; then
+  log "INFO" "Rendering Museum server configuration"
+  cat > "$MUSEUM_CONFIG" << EOF
 # Museum server configuration
 
 # Server settings
@@ -325,8 +344,11 @@ jobs:
   cron:
     skip: true
 EOF
-chmod 600 "$MUSEUM_CONFIG"
-log "INFO" "Wrote Museum configuration to ${MUSEUM_CONFIG}"
+  chmod 600 "$MUSEUM_CONFIG"
+  log "INFO" "Wrote Museum configuration to ${MUSEUM_CONFIG}"
+else
+  log "INFO" "Museum configuration already present at ${MUSEUM_CONFIG}; preserving existing file"
+fi
 
 # ===============================================
 # Database check