feat: add SAAS_ADMIN_EMAIL to both installers
Derive admin email from <ADMIN_USER>@<PUBLIC_HOST> by default. Supports override via --admin-email CLI flag, SAAS_ADMIN_EMAIL env var, or admin_email in cameleer.conf. Written to .env for bootstrap.
This commit is contained in:
11
install.sh
11
install.sh
@@ -56,6 +56,7 @@ AUTH_HOST=""
|
||||
PUBLIC_PROTOCOL=""
|
||||
ADMIN_USER=""
|
||||
ADMIN_PASS=""
|
||||
ADMIN_EMAIL=""
|
||||
TLS_MODE=""
|
||||
CERT_FILE=""
|
||||
KEY_FILE=""
|
||||
@@ -168,6 +169,7 @@ parse_args() {
|
||||
--public-protocol) PUBLIC_PROTOCOL="$2"; shift ;;
|
||||
--admin-user) ADMIN_USER="$2"; shift ;;
|
||||
--admin-password) ADMIN_PASS="$2"; shift ;;
|
||||
--admin-email) ADMIN_EMAIL="$2"; shift ;;
|
||||
--tls-mode) TLS_MODE="$2"; shift ;;
|
||||
--cert-file) CERT_FILE="$2"; shift ;;
|
||||
--key-file) KEY_FILE="$2"; shift ;;
|
||||
@@ -262,6 +264,7 @@ load_config_file() {
|
||||
public_protocol) [ -z "$PUBLIC_PROTOCOL" ] && PUBLIC_PROTOCOL="$value" ;;
|
||||
admin_user) [ -z "$ADMIN_USER" ] && ADMIN_USER="$value" ;;
|
||||
admin_password) [ -z "$ADMIN_PASS" ] && ADMIN_PASS="$value" ;;
|
||||
admin_email) [ -z "$ADMIN_EMAIL" ] && ADMIN_EMAIL="$value" ;;
|
||||
tls_mode) [ -z "$TLS_MODE" ] && TLS_MODE="$value" ;;
|
||||
cert_file) [ -z "$CERT_FILE" ] && CERT_FILE="$value" ;;
|
||||
key_file) [ -z "$KEY_FILE" ] && KEY_FILE="$value" ;;
|
||||
@@ -292,6 +295,7 @@ load_env_overrides() {
|
||||
[ -z "$PUBLIC_PROTOCOL" ] && PUBLIC_PROTOCOL="$_ENV_PUBLIC_PROTOCOL"
|
||||
[ -z "$ADMIN_USER" ] && ADMIN_USER="${SAAS_ADMIN_USER:-}"
|
||||
[ -z "$ADMIN_PASS" ] && ADMIN_PASS="${SAAS_ADMIN_PASS:-}"
|
||||
[ -z "$ADMIN_EMAIL" ] && ADMIN_EMAIL="${SAAS_ADMIN_EMAIL:-}"
|
||||
[ -z "$TLS_MODE" ] && TLS_MODE="$_ENV_TLS_MODE"
|
||||
[ -z "$CERT_FILE" ] && CERT_FILE="$_ENV_CERT_FILE"
|
||||
[ -z "$KEY_FILE" ] && KEY_FILE="$_ENV_KEY_FILE"
|
||||
@@ -597,6 +601,9 @@ generate_passwords() {
|
||||
ADMIN_PASS=$(generate_password)
|
||||
log_info "Generated admin password."
|
||||
fi
|
||||
if [ -z "$ADMIN_EMAIL" ]; then
|
||||
ADMIN_EMAIL="${ADMIN_USER}@${PUBLIC_HOST:-localhost}"
|
||||
fi
|
||||
if [ -z "$POSTGRES_PASSWORD" ]; then
|
||||
POSTGRES_PASSWORD=$(generate_password)
|
||||
log_info "Generated PostgreSQL password."
|
||||
@@ -705,6 +712,7 @@ POSTGRES_DB=cameleer_saas
|
||||
|
||||
# Admin user
|
||||
SAAS_ADMIN_USER=${ADMIN_USER}
|
||||
SAAS_ADMIN_EMAIL=${ADMIN_EMAIL}
|
||||
|
||||
# TLS
|
||||
NODE_TLS_REJECT=${NODE_TLS_REJECT}
|
||||
@@ -918,6 +926,7 @@ public_host=${PUBLIC_HOST}
|
||||
auth_host=${AUTH_HOST}
|
||||
public_protocol=${PUBLIC_PROTOCOL}
|
||||
admin_user=${ADMIN_USER}
|
||||
admin_email=${ADMIN_EMAIL}
|
||||
tls_mode=${TLS_MODE}
|
||||
http_port=${HTTP_PORT}
|
||||
https_port=${HTTPS_PORT}
|
||||
@@ -974,6 +983,7 @@ EOF
|
||||
Admin Console: ${PUBLIC_PROTOCOL}://${PUBLIC_HOST}/platform/
|
||||
Admin User: ${ADMIN_USER}
|
||||
Admin Password: ${ADMIN_PASS}
|
||||
Admin Email: ${ADMIN_EMAIL}
|
||||
|
||||
PostgreSQL: cameleer / ${POSTGRES_PASSWORD}
|
||||
ClickHouse: default / ${CLICKHOUSE_PASSWORD}
|
||||
@@ -1291,6 +1301,7 @@ print_credentials() {
|
||||
fi
|
||||
echo -e " Admin User: ${BOLD}${ADMIN_USER}${NC}"
|
||||
echo -e " Admin Password: ${BOLD}${ADMIN_PASS}${NC}"
|
||||
echo -e " Admin Email: ${BOLD}${ADMIN_EMAIL}${NC}"
|
||||
echo ""
|
||||
echo -e " PostgreSQL: cameleer / ${POSTGRES_PASSWORD}"
|
||||
echo -e " ClickHouse: default / ${CLICKHOUSE_PASSWORD}"
|
||||
|
||||
Reference in New Issue
Block a user