From 4037fb9dfbc1a3a6206648c962826ec716ab1f2d Mon Sep 17 00:00:00 2001 From: hsiegeln <37154749+hsiegeln@users.noreply.github.com> Date: Sat, 25 Apr 2026 18:08:48 +0200 Subject: [PATCH] feat: remove SMTP configuration from PowerShell installer --- install.ps1 | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/install.ps1 b/install.ps1 index f3afc82..5b71089 100644 --- a/install.ps1 +++ b/install.ps1 @@ -37,11 +37,6 @@ param( [string]$DockerSocket, [string]$NodeTlsReject, [string]$DeploymentMode, - [string]$SmtpHost, - [string]$SmtpPort, - [string]$SmtpUser, - [string]$SmtpPass, - [string]$SmtpFromEmail, [string]$Registry, [string]$RegistryUser, [string]$RegistryToken, @@ -92,11 +87,6 @@ $_ENV_COMPOSE_PROJECT = $env:COMPOSE_PROJECT $_ENV_DOCKER_SOCKET = $env:DOCKER_SOCKET $_ENV_NODE_TLS_REJECT = $env:NODE_TLS_REJECT $_ENV_DEPLOYMENT_MODE = $env:DEPLOYMENT_MODE -$_ENV_SMTP_HOST = $env:SMTP_HOST -$_ENV_SMTP_PORT = $env:SMTP_PORT -$_ENV_SMTP_USER = $env:SMTP_USER -$_ENV_SMTP_PASS = $env:SMTP_PASS -$_ENV_SMTP_FROM_EMAIL = $env:SMTP_FROM_EMAIL $_ENV_REGISTRY = $env:REGISTRY $_ENV_REGISTRY_USER = $env:REGISTRY_USER $_ENV_REGISTRY_TOKEN = $env:REGISTRY_TOKEN @@ -126,11 +116,6 @@ $script:cfg = @{ DockerSocket = $DockerSocket NodeTlsReject = $NodeTlsReject DeploymentMode = $DeploymentMode - SmtpHost = $SmtpHost - SmtpPort = $SmtpPort - SmtpUser = $SmtpUser - SmtpPass = $SmtpPass - SmtpFromEmail = $SmtpFromEmail Registry = $Registry RegistryUser = $RegistryUser RegistryToken = $RegistryToken @@ -302,11 +287,6 @@ function Load-ConfigFile { 'docker_socket' { if (-not $script:cfg.DockerSocket) { $script:cfg.DockerSocket = $val } } 'node_tls_reject' { if (-not $script:cfg.NodeTlsReject) { $script:cfg.NodeTlsReject = $val } } 'deployment_mode' { if (-not $script:cfg.DeploymentMode) { $script:cfg.DeploymentMode = $val } } - 'smtp_host' { if (-not $script:cfg.SmtpHost) { $script:cfg.SmtpHost = $val } } - 'smtp_port' { if (-not $script:cfg.SmtpPort) { $script:cfg.SmtpPort = $val } } - 'smtp_user' { if (-not $script:cfg.SmtpUser) { $script:cfg.SmtpUser = $val } } - 'smtp_pass' { if (-not $script:cfg.SmtpPass) { $script:cfg.SmtpPass = $val } } - 'smtp_from_email' { if (-not $script:cfg.SmtpFromEmail) { $script:cfg.SmtpFromEmail = $val } } 'registry' { if (-not $script:cfg.Registry) { $script:cfg.Registry = $val } } 'registry_user' { if (-not $script:cfg.RegistryUser) { $script:cfg.RegistryUser = $val } } 'registry_token' { if (-not $script:cfg.RegistryToken) { $script:cfg.RegistryToken = $val } } @@ -339,11 +319,6 @@ function Load-EnvOverrides { if (-not $c.DockerSocket) { $c.DockerSocket = $_ENV_DOCKER_SOCKET } if (-not $c.NodeTlsReject) { $c.NodeTlsReject = $_ENV_NODE_TLS_REJECT } if (-not $c.DeploymentMode) { $c.DeploymentMode = $_ENV_DEPLOYMENT_MODE } - if (-not $c.SmtpHost) { $c.SmtpHost = $_ENV_SMTP_HOST } - if (-not $c.SmtpPort) { $c.SmtpPort = $_ENV_SMTP_PORT } - if (-not $c.SmtpUser) { $c.SmtpUser = $_ENV_SMTP_USER } - if (-not $c.SmtpPass) { $c.SmtpPass = $_ENV_SMTP_PASS } - if (-not $c.SmtpFromEmail) { $c.SmtpFromEmail = $_ENV_SMTP_FROM_EMAIL } if (-not $c.Registry) { $c.Registry = $_ENV_REGISTRY } if (-not $c.RegistryUser) { $c.RegistryUser = $_ENV_REGISTRY_USER } if (-not $c.RegistryToken) { $c.RegistryToken = $_ENV_REGISTRY_TOKEN } @@ -513,17 +488,6 @@ function Run-SimplePrompts { $deployChoice = Read-Host ' Select mode [1]' if ($deployChoice -eq '2') { $c.DeploymentMode = 'standalone' } else { $c.DeploymentMode = 'saas' } - # SMTP for email verification (SaaS mode only) - if ($c.DeploymentMode -eq 'saas') { - Write-Host '' - if (Prompt-YesNo 'Configure SMTP for email verification? (required for self-service sign-up)') { - $c.SmtpHost = Prompt-Value 'SMTP host' (Coalesce $c.SmtpHost '') - $c.SmtpPort = Prompt-Value 'SMTP port' (Coalesce $c.SmtpPort '587') - $c.SmtpUser = Prompt-Value 'SMTP username' (Coalesce $c.SmtpUser '') - $c.SmtpPass = Prompt-Password 'SMTP password' (Coalesce $c.SmtpPass '') - $c.SmtpFromEmail = Prompt-Value 'From email address' (Coalesce $c.SmtpFromEmail "noreply@$($c.PublicHost)") - } - } } function Run-ExpertPrompts { @@ -774,19 +738,12 @@ CAMELEER_SAAS_PROVISIONING_RUNTIMEBASEIMAGE=$reg/cameleer-runtime-base:$($c.Vers # JWT signing secret (forwarded to provisioned tenant servers, must be non-empty) CAMELEER_SERVER_SECURITY_JWTSECRET=$jwtSecret - -# SMTP (for email verification during registration) -SMTP_HOST=$($c.SmtpHost) -SMTP_PORT=$(if ($c.SmtpPort) { $c.SmtpPort } else { '587' }) -SMTP_USER=$($c.SmtpUser) -SMTP_FROM_EMAIL=$(if ($c.SmtpFromEmail) { $c.SmtpFromEmail } else { "noreply@$($c.PublicHost)" }) "@ $content += $provisioningBlock # Passwords appended with single-quoting for special character safety $content += "`n$(Format-EnvVal 'POSTGRES_PASSWORD' $c.PostgresPassword)" $content += "`n$(Format-EnvVal 'CLICKHOUSE_PASSWORD' $c.ClickhousePassword)" $content += "`n$(Format-EnvVal 'SAAS_ADMIN_PASS' $c.AdminPass)" - $content += "`n$(Format-EnvVal 'SMTP_PASS' $c.SmtpPass)" $composeFile = 'docker-compose.yml;docker-compose.saas.yml' if ($c.TlsMode -eq 'custom') { $composeFile += ';docker-compose.tls.yml' } if ($c.MonitoringNetwork) { $composeFile += ';docker-compose.monitoring.yml' } @@ -1025,15 +982,10 @@ compose_project=$($c.ComposeProject) docker_socket=$($c.DockerSocket) node_tls_reject=$($c.NodeTlsReject) deployment_mode=$($c.DeploymentMode) -smtp_host=$($c.SmtpHost) -smtp_port=$($c.SmtpPort) -smtp_user=$($c.SmtpUser) -smtp_from_email=$($c.SmtpFromEmail) registry=$($c.Registry) registry_user=$($c.RegistryUser) "@ # Passwords appended with single-quoting for special character safety - $txt += "`n$(Format-EnvVal 'smtp_pass' $c.SmtpPass)" $txt += "`n$(Format-EnvVal 'registry_token' $c.RegistryToken)" Write-Utf8File $f $txt Log-Info 'Saved installer config to cameleer.conf'