|
|
|
|
@@ -22,6 +22,16 @@ log() {
|
|
|
|
|
log "INFO" "Starting Ente Cloudron app"
|
|
|
|
|
log "INFO" "Running in Cloudron environment with domain: ${CLOUDRON_APP_DOMAIN}"
|
|
|
|
|
|
|
|
|
|
# Ensure HOME is writable (needed for CLI usage)
|
|
|
|
|
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
|
|
|
|
|
@@ -84,16 +94,103 @@ else
|
|
|
|
|
fi
|
|
|
|
|
RP_ID="${CLOUDRON_APP_FQDN:-${CLOUDRON_APP_DOMAIN:-localhost}}"
|
|
|
|
|
|
|
|
|
|
# S3 configuration - HARDCODED VALUES
|
|
|
|
|
S3_ACCESS_KEY="QZ5M3VMBUHDTIFDFCD8E"
|
|
|
|
|
S3_SECRET_KEY="pz1eHYjU1NwAbbruedc7swzCuszd57p1rGSFVzjv"
|
|
|
|
|
S3_ENDPOINT="https://s3.eu-central-2.wasabisys.com"
|
|
|
|
|
# S3 configuration (overridable post-install)
|
|
|
|
|
DEFAULT_S3_ACCESS_KEY="QZ5M3VMBUHDTIFDFCD8E"
|
|
|
|
|
DEFAULT_S3_SECRET_KEY="pz1eHYjU1NwAbbruedc7swzCuszd57p1rGSFVzjv"
|
|
|
|
|
DEFAULT_S3_ENDPOINT="https://s3.eu-central-2.wasabisys.com"
|
|
|
|
|
DEFAULT_S3_REGION="eu-central-2"
|
|
|
|
|
DEFAULT_S3_BUCKET="ente-due-ren"
|
|
|
|
|
|
|
|
|
|
S3_CONFIG_DIR="/app/data/config"
|
|
|
|
|
S3_CONFIG_FILE="$S3_CONFIG_DIR/s3.env"
|
|
|
|
|
|
|
|
|
|
write_default_s3_template() {
|
|
|
|
|
cat > "$S3_CONFIG_FILE" << 'EOF'
|
|
|
|
|
# S3 configuration overrides for Ente on Cloudron.
|
|
|
|
|
# Uncomment and set any of the variables below to override the packaged defaults.
|
|
|
|
|
# After editing this file, restart the Ente app from the Cloudron dashboard.
|
|
|
|
|
#
|
|
|
|
|
# Example (previous Wasabi defaults bundled with this package):
|
|
|
|
|
#S3_ACCESS_KEY=QZ5M3VMBUHDTIFDFCD8E
|
|
|
|
|
#S3_SECRET_KEY=pz1eHYjU1NwAbbruedc7swzCuszd57p1rGSFVzjv
|
|
|
|
|
#S3_ENDPOINT=https://s3.eu-central-2.wasabisys.com
|
|
|
|
|
#S3_REGION=eu-central-2
|
|
|
|
|
#S3_BUCKET=ente-due-ren
|
|
|
|
|
#
|
|
|
|
|
# Example (Cloudflare R2 — replace placeholders):
|
|
|
|
|
#S3_ACCESS_KEY=R2_ACCESS_KEY
|
|
|
|
|
#S3_SECRET_KEY=R2_SECRET_KEY
|
|
|
|
|
#S3_ENDPOINT=https://<ACCOUNT_ID>.r2.cloudflarestorage.com
|
|
|
|
|
#S3_REGION=auto
|
|
|
|
|
#S3_BUCKET=<bucket-name>
|
|
|
|
|
#
|
|
|
|
|
#S3_ACCESS_KEY=
|
|
|
|
|
#S3_SECRET_KEY=
|
|
|
|
|
#S3_ENDPOINT=
|
|
|
|
|
#S3_REGION=
|
|
|
|
|
#S3_BUCKET=
|
|
|
|
|
EOF
|
|
|
|
|
chown cloudron:cloudron "$S3_CONFIG_FILE" || true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mkdir -p "$S3_CONFIG_DIR"
|
|
|
|
|
|
|
|
|
|
if [ -f "$S3_CONFIG_FILE" ]; then
|
|
|
|
|
if ! grep -q "previous Wasabi defaults" "$S3_CONFIG_FILE" && ! grep -Eq '^[[:space:]]*[^#[:space:]]' "$S3_CONFIG_FILE"; then
|
|
|
|
|
log "INFO" "Refreshing S3 configuration template with example values"
|
|
|
|
|
write_default_s3_template
|
|
|
|
|
fi
|
|
|
|
|
log "INFO" "Loading S3 configuration overrides from $S3_CONFIG_FILE"
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
set -a
|
|
|
|
|
. "$S3_CONFIG_FILE"
|
|
|
|
|
set +a
|
|
|
|
|
else
|
|
|
|
|
log "INFO" "S3 configuration file not found, writing template to $S3_CONFIG_FILE"
|
|
|
|
|
write_default_s3_template
|
|
|
|
|
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" ] && 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
|
|
|
|
|
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}"
|
|
|
|
|
S3_SECRET_KEY="${S3_SECRET_KEY:-$DEFAULT_S3_SECRET_KEY}"
|
|
|
|
|
S3_ENDPOINT="${S3_ENDPOINT:-$DEFAULT_S3_ENDPOINT}"
|
|
|
|
|
S3_REGION="${S3_REGION:-$DEFAULT_S3_REGION}"
|
|
|
|
|
S3_BUCKET="${S3_BUCKET:-$DEFAULT_S3_BUCKET}"
|
|
|
|
|
|
|
|
|
|
S3_ENDPOINT_HOST="${S3_ENDPOINT#https://}"
|
|
|
|
|
S3_ENDPOINT_HOST="${S3_ENDPOINT_HOST#http://}"
|
|
|
|
|
S3_REGION="eu-central-2"
|
|
|
|
|
S3_BUCKET="ente-due-ren"
|
|
|
|
|
|
|
|
|
|
log "INFO" "Using hardcoded S3 configuration"
|
|
|
|
|
if [ -z "$S3_ACCESS_KEY" ] || [ -z "$S3_SECRET_KEY" ] || [ -z "$S3_ENDPOINT" ] || [ -z "$S3_REGION" ] || [ -z "$S3_BUCKET" ]; then
|
|
|
|
|
log "ERROR" "Incomplete S3 configuration detected. Please update $S3_CONFIG_FILE or set environment variables."
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
log "INFO" "Using S3 configuration"
|
|
|
|
|
log "INFO" "S3 Endpoint: $S3_ENDPOINT"
|
|
|
|
|
log "INFO" "S3 Region: $S3_REGION"
|
|
|
|
|
log "INFO" "S3 Bucket: $S3_BUCKET"
|
|
|
|
|
@@ -123,6 +220,7 @@ MUSEUM_CONFIG_DIR="/app/data/ente/server/configurations"
|
|
|
|
|
MUSEUM_CONFIG="$MUSEUM_CONFIG_DIR/local.yaml"
|
|
|
|
|
mkdir -p "$MUSEUM_CONFIG_DIR"
|
|
|
|
|
|
|
|
|
|
if [ ! -f "$MUSEUM_CONFIG" ]; then
|
|
|
|
|
log "INFO" "Rendering Museum server configuration"
|
|
|
|
|
cat > "$MUSEUM_CONFIG" << EOF
|
|
|
|
|
# Museum server configuration
|
|
|
|
|
@@ -248,6 +346,9 @@ jobs:
|
|
|
|
|
EOF
|
|
|
|
|
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
|
|
|
|
|
@@ -402,34 +503,6 @@ for webapp in photos accounts auth cast; do
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# ===============================================
|
|
|
|
|
# Museum log highlighter (extract OTTs from logs)
|
|
|
|
|
# ===============================================
|
|
|
|
|
prepare_ott_highlighter() {
|
|
|
|
|
cat > "/app/data/ente/server/ott-log-highlight.js" << 'EOF'
|
|
|
|
|
const readline = require('readline');
|
|
|
|
|
const rl = readline.createInterface({ input: process.stdin });
|
|
|
|
|
|
|
|
|
|
const shouldHighlight = (line) => {
|
|
|
|
|
if (!line) return false;
|
|
|
|
|
const lower = line.toLowerCase();
|
|
|
|
|
if (lower.includes('added ott')) return true;
|
|
|
|
|
if (lower.includes('ott"') || lower.includes(' ott ')) return true;
|
|
|
|
|
return false;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
rl.on('line', (line) => {
|
|
|
|
|
process.stdout.write(line + '\n');
|
|
|
|
|
if (shouldHighlight(line)) {
|
|
|
|
|
const trimmed = line.trim();
|
|
|
|
|
process.stdout.write('============================================================\n');
|
|
|
|
|
process.stdout.write(`HIGHLIGHT: ${trimmed}\n`);
|
|
|
|
|
process.stdout.write('============================================================\n');
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
EOF
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# ===============================================
|
|
|
|
|
# Node.js Placeholder Server
|
|
|
|
|
# ===============================================
|
|
|
|
|
@@ -571,9 +644,7 @@ const apiHandlers = {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const responsePayload = buildResponse(email);
|
|
|
|
|
log('============================================================');
|
|
|
|
|
log(`HIGHLIGHT: Verifying OTT ${ott} for ${email}`);
|
|
|
|
|
log('============================================================');
|
|
|
|
|
log(`Verifying OTT ${ott} for ${email}`);
|
|
|
|
|
|
|
|
|
|
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
|
|
|
res.end(JSON.stringify(responsePayload));
|
|
|
|
|
@@ -660,9 +731,7 @@ const apiHandlers = {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const ott = ('' + Math.floor(100000 + Math.random() * 900000)).slice(-6);
|
|
|
|
|
log('============================================================');
|
|
|
|
|
log(`HIGHLIGHT: Generated OTT ${ott} for ${email}`);
|
|
|
|
|
log('============================================================');
|
|
|
|
|
log(`Generated OTT ${ott} for ${email}`);
|
|
|
|
|
|
|
|
|
|
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
|
|
|
res.end(JSON.stringify({ success: true, ott, email }));
|
|
|
|
|
@@ -834,10 +903,9 @@ if [ "$USE_PLACEHOLDER" = true ]; then
|
|
|
|
|
create_nodejs_placeholder
|
|
|
|
|
else
|
|
|
|
|
log "INFO" "Starting actual Museum server"
|
|
|
|
|
prepare_ott_highlighter
|
|
|
|
|
cd /app/data/ente/server
|
|
|
|
|
export ENVIRONMENT="${MUSEUM_ENVIRONMENT:-local}"
|
|
|
|
|
stdbuf -oL "$MUSEUM_BIN" 2>&1 | node ott-log-highlight.js | tee -a "$MUSEUM_LOG" &
|
|
|
|
|
stdbuf -oL "$MUSEUM_BIN" 2>&1 | tee -a "$MUSEUM_LOG" &
|
|
|
|
|
MUSEUM_PID=$!
|
|
|
|
|
log "INFO" "Started Museum server (pipeline PID: $MUSEUM_PID)"
|
|
|
|
|
|
|
|
|
|
@@ -996,7 +1064,7 @@ cat > /app/data/SETUP-INSTRUCTIONS.md << EOF
|
|
|
|
|
|
|
|
|
|
## Configuration
|
|
|
|
|
|
|
|
|
|
1. **S3 Storage**: Edit the configuration file at \`/app/data/s3.env\` with your S3-compatible storage credentials.
|
|
|
|
|
1. **S3 Storage**: Edit the configuration file at \`/app/data/config/s3.env\` (uncomment lines and add your values) with your S3-compatible storage credentials.
|
|
|
|
|
|
|
|
|
|
2. **Museum Server**: The server configuration is at \`/app/data/ente/server/museum.yaml\` if you need to customize settings.
|
|
|
|
|
|
|
|
|
|
|
