diff --git a/CloudronManifest.json b/CloudronManifest.json index c677c14..d0ae3fc 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -5,7 +5,7 @@ "description": "Next-gen knowledge base that blends docs, whiteboards, and databases for self-hosted teams.", "website": "https://affine.pro", "contactEmail": "support@affine.pro", - "version": "0.1.11", + "version": "0.1.12", "changelog": "Initial Cloudron packaging", "manifestVersion": 2, "minBoxVersion": "7.0.0", diff --git a/start.sh b/start.sh index 6d6ef94..2fd3397 100644 --- a/start.sh +++ b/start.sh @@ -75,14 +75,26 @@ configure_redis() { import os from urllib.parse import urlparse url = os.environ.get('CLOUDRON_REDIS_URL') -if not url: - raise SystemExit('redis url missing') -parsed = urlparse(url) -host = parsed.hostname or 'localhost' -port = parsed.port or 6379 -password = parsed.password or '' -db = (parsed.path or '/0').lstrip('/') or '0' -username = parsed.username or '' +parsed = urlparse(url) if url else None +host = os.environ.get('CLOUDRON_REDIS_HOST') +port = os.environ.get('CLOUDRON_REDIS_PORT') +password = os.environ.get('CLOUDRON_REDIS_PASSWORD') +username = os.environ.get('CLOUDRON_REDIS_USERNAME') +db = os.environ.get('CLOUDRON_REDIS_DB') +if not host and parsed: + host = parsed.hostname or 'localhost' +if not port and parsed: + port = parsed.port or 6379 +if not password and parsed: + password = parsed.password or '' +if not db and parsed: + db = (parsed.path or '/0').lstrip('/') or '0' +if username is None: + username = parsed.username if parsed and parsed.username else 'default' +host = host or 'localhost' +port = port or 6379 +password = password or '' +db = db or '0' print(f"{host}\n{port}\n{password}\n{db}\n{username}") PY )