From 35240e0374082f952254783d70e333945ba7dbe8 Mon Sep 17 00:00:00 2001 From: hsiegeln <37154749+hsiegeln@users.noreply.github.com> Date: Sat, 25 Apr 2026 18:08:44 +0200 Subject: [PATCH] feat: remove SMTP configuration from bash installer --- install.sh | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/install.sh b/install.sh index cb75680..eb51786 100644 --- a/install.sh +++ b/install.sh @@ -46,11 +46,6 @@ _ENV_COMPOSE_PROJECT="${COMPOSE_PROJECT:-}" _ENV_DOCKER_SOCKET="${DOCKER_SOCKET:-}" _ENV_NODE_TLS_REJECT="${NODE_TLS_REJECT:-}" _ENV_DEPLOYMENT_MODE="${DEPLOYMENT_MODE:-}" -_ENV_SMTP_HOST="${SMTP_HOST:-}" -_ENV_SMTP_PORT="${SMTP_PORT:-}" -_ENV_SMTP_USER="${SMTP_USER:-}" -_ENV_SMTP_PASS="${SMTP_PASS:-}" -_ENV_SMTP_FROM_EMAIL="${SMTP_FROM_EMAIL:-}" _ENV_REGISTRY="${REGISTRY:-}" _ENV_REGISTRY_USER="${REGISTRY_USER:-}" _ENV_REGISTRY_TOKEN="${REGISTRY_TOKEN:-}" @@ -77,11 +72,6 @@ COMPOSE_PROJECT="" DOCKER_SOCKET="" NODE_TLS_REJECT="" DEPLOYMENT_MODE="" -SMTP_HOST="" -SMTP_PORT="" -SMTP_USER="" -SMTP_PASS="" -SMTP_FROM_EMAIL="" REGISTRY="" REGISTRY_USER="" REGISTRY_TOKEN="" @@ -194,11 +184,6 @@ parse_args() { --docker-socket) DOCKER_SOCKET="$2"; shift ;; --node-tls-reject) NODE_TLS_REJECT="$2"; shift ;; --deployment-mode) DEPLOYMENT_MODE="$2"; shift ;; - --smtp-host) SMTP_HOST="$2"; shift ;; - --smtp-port) SMTP_PORT="$2"; shift ;; - --smtp-user) SMTP_USER="$2"; shift ;; - --smtp-pass) SMTP_PASS="$2"; shift ;; - --smtp-from-email) SMTP_FROM_EMAIL="$2"; shift ;; --registry) REGISTRY="$2"; shift ;; --registry-user) REGISTRY_USER="$2"; shift ;; --registry-token) REGISTRY_TOKEN="$2"; shift ;; @@ -293,11 +278,6 @@ load_config_file() { docker_socket) [ -z "$DOCKER_SOCKET" ] && DOCKER_SOCKET="$value" ;; node_tls_reject) [ -z "$NODE_TLS_REJECT" ] && NODE_TLS_REJECT="$value" ;; deployment_mode) [ -z "$DEPLOYMENT_MODE" ] && DEPLOYMENT_MODE="$value" ;; - smtp_host) [ -z "$SMTP_HOST" ] && SMTP_HOST="$value" ;; - smtp_port) [ -z "$SMTP_PORT" ] && SMTP_PORT="$value" ;; - smtp_user) [ -z "$SMTP_USER" ] && SMTP_USER="$value" ;; - smtp_pass) [ -z "$SMTP_PASS" ] && SMTP_PASS="$value" ;; - smtp_from_email) [ -z "$SMTP_FROM_EMAIL" ] && SMTP_FROM_EMAIL="$value" ;; registry) [ -z "$REGISTRY" ] && REGISTRY="$value" ;; registry_user) [ -z "$REGISTRY_USER" ] && REGISTRY_USER="$value" ;; registry_token) [ -z "$REGISTRY_TOKEN" ] && REGISTRY_TOKEN="$value" ;; @@ -328,11 +308,6 @@ load_env_overrides() { [ -z "$DOCKER_SOCKET" ] && DOCKER_SOCKET="$_ENV_DOCKER_SOCKET" [ -z "$NODE_TLS_REJECT" ] && NODE_TLS_REJECT="$_ENV_NODE_TLS_REJECT" [ -z "$DEPLOYMENT_MODE" ] && DEPLOYMENT_MODE="$_ENV_DEPLOYMENT_MODE" - [ -z "$SMTP_HOST" ] && SMTP_HOST="$_ENV_SMTP_HOST" - [ -z "$SMTP_PORT" ] && SMTP_PORT="$_ENV_SMTP_PORT" - [ -z "$SMTP_USER" ] && SMTP_USER="$_ENV_SMTP_USER" - [ -z "$SMTP_PASS" ] && SMTP_PASS="$_ENV_SMTP_PASS" - [ -z "$SMTP_FROM_EMAIL" ] && SMTP_FROM_EMAIL="$_ENV_SMTP_FROM_EMAIL" [ -z "$REGISTRY" ] && REGISTRY="$_ENV_REGISTRY" [ -z "$REGISTRY_USER" ] && REGISTRY_USER="$_ENV_REGISTRY_USER" [ -z "$REGISTRY_TOKEN" ] && REGISTRY_TOKEN="$_ENV_REGISTRY_TOKEN" @@ -496,17 +471,6 @@ run_simple_prompts() { ;; esac - # SMTP for email verification (SaaS mode only) - if [ "$DEPLOYMENT_MODE" = "saas" ]; then - echo "" - if prompt_yesno "Configure SMTP for email verification? (required for self-service sign-up)"; then - prompt SMTP_HOST "SMTP host" "${SMTP_HOST:-}" - prompt SMTP_PORT "SMTP port" "${SMTP_PORT:-587}" - prompt SMTP_USER "SMTP username" "${SMTP_USER:-}" - prompt_password SMTP_PASS "SMTP password" "${SMTP_PASS:-}" - prompt SMTP_FROM_EMAIL "From email address" "${SMTP_FROM_EMAIL:-noreply@${PUBLIC_HOST}}" - fi - fi } run_expert_prompts() { @@ -777,12 +741,6 @@ CAMELEER_SAAS_PROVISIONING_RUNTIMEBASEIMAGE=${REGISTRY}/cameleer-runtime-base:${ # JWT signing secret (forwarded to provisioned tenant servers, must be non-empty) CAMELEER_SERVER_SECURITY_JWTSECRET=$(generate_password) -# SMTP (for email verification during registration) -SMTP_HOST=${SMTP_HOST} -SMTP_PORT=${SMTP_PORT:-587} -SMTP_USER=${SMTP_USER} -SMTP_FROM_EMAIL=${SMTP_FROM_EMAIL:-noreply@${PUBLIC_HOST}} - # Compose file assembly COMPOSE_FILE=docker-compose.yml:docker-compose.saas.yml$([ "$TLS_MODE" = "custom" ] && echo ":docker-compose.tls.yml")$([ -n "$MONITORING_NETWORK" ] && echo ":docker-compose.monitoring.yml") EOF @@ -791,7 +749,6 @@ EOF env_val "$f" POSTGRES_PASSWORD "$POSTGRES_PASSWORD" env_val "$f" CLICKHOUSE_PASSWORD "$CLICKHOUSE_PASSWORD" env_val "$f" SAAS_ADMIN_PASS "$ADMIN_PASS" - env_val "$f" SMTP_PASS "$SMTP_PASS" if [ -n "$MONITORING_NETWORK" ]; then echo "" >> "$f" @@ -972,15 +929,10 @@ compose_project=${COMPOSE_PROJECT} docker_socket=${DOCKER_SOCKET} node_tls_reject=${NODE_TLS_REJECT} deployment_mode=${DEPLOYMENT_MODE} -smtp_host=${SMTP_HOST} -smtp_port=${SMTP_PORT} -smtp_user=${SMTP_USER} -smtp_from_email=${SMTP_FROM_EMAIL} registry=${REGISTRY} registry_user=${REGISTRY_USER} EOF # Passwords appended with single-quoting for special character safety - env_val "$f" smtp_pass "$SMTP_PASS" env_val "$f" registry_token "$REGISTRY_TOKEN" log_info "Saved installer config to cameleer.conf" }