cameleer/cameleer-saas-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: unify admin identity — SAAS_ADMIN_USER is the email in SaaS mode

Browse Source 
Move deployment mode question before admin credentials so the installer
can validate email format in SaaS mode. Remove separate SAAS_ADMIN_EMAIL
— the admin user value IS the email address. In standalone mode, any
username is still accepted.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hsiegeln
2026-04-25 20:45:25 +02:00
parent 0da26160c6
commit 21ea9515a2
5 changed files with 71 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
install.ps1
View File

@@ -100,7 +100,7 @@ $script:cfg = @{
PublicProtocol = $PublicProtocol
AdminUser = $AdminUser
AdminPass = $AdminPassword
AdminEmail = $null
TlsMode = $TlsMode
CertFile = $CertFile
KeyFile = $KeyFile
@@ -272,7 +272,7 @@ function Load-ConfigFile {
'public_protocol' { if (-not $script:cfg.PublicProtocol) { $script:cfg.PublicProtocol = $val } }
'admin_user' { if (-not $script:cfg.AdminUser) { $script:cfg.AdminUser = $val } }
'admin_password' { if (-not $script:cfg.AdminPass) { $script:cfg.AdminPass = $val } }
'admin_email' { if (-not $script:cfg.AdminEmail) { $script:cfg.AdminEmail = $val } }
'tls_mode' { if (-not $script:cfg.TlsMode) { $script:cfg.TlsMode = $val } }
'cert_file' { if (-not $script:cfg.CertFile) { $script:cfg.CertFile = $val } }
'key_file' { if (-not $script:cfg.KeyFile) { $script:cfg.KeyFile = $val } }
@@ -305,7 +305,7 @@ function Load-EnvOverrides {
if (-not $c.PublicProtocol) { $c.PublicProtocol = $_ENV_PUBLIC_PROTOCOL }
if (-not $c.AdminUser) { $c.AdminUser = $env:SAAS_ADMIN_USER }
if (-not $c.AdminPass) { $c.AdminPass = $env:SAAS_ADMIN_PASS }
if (-not $c.AdminEmail) { $c.AdminEmail = $env:SAAS_ADMIN_EMAIL }
if (-not $c.TlsMode) { $c.TlsMode = $_ENV_TLS_MODE }
if (-not $c.CertFile) { $c.CertFile = $_ENV_CERT_FILE }
if (-not $c.KeyFile) { $c.KeyFile = $_ENV_KEY_FILE }
@@ -450,17 +450,41 @@ function Run-SimplePrompts {
Write-Host ''
Write-Host '--- Simple Installation ---' -ForegroundColor Cyan
Write-Host ''
$c.InstallDir = Prompt-Value 'Install directory' (Coalesce $c.InstallDir $DEFAULT_INSTALL_DIR)
$c.PublicHost = Prompt-Value 'Public hostname' (Coalesce $c.PublicHost 'localhost')
$c.AdminUser = Prompt-Value 'Admin username' (Coalesce $c.AdminUser $DEFAULT_ADMIN_USER)
Write-Host ''
Write-Host ' Deployment mode:'
Write-Host ' [1] Multi-tenant SaaS -- manage platform, provision tenants on demand'
Write-Host ' [2] Single-tenant -- one server instance, local auth, no identity provider'
Write-Host ''
$deployChoice = Read-Host ' Select mode [1]'
if ($deployChoice -eq '2') { $c.DeploymentMode = 'standalone' } else { $c.DeploymentMode = 'saas' }
Write-Host ''
if ($c.DeploymentMode -eq 'saas') {
$defaultEmail = Coalesce $c.AdminUser "admin@$($c.PublicHost)"
if ($defaultEmail -and -not $defaultEmail.Contains('@')) {
$defaultEmail = "admin@$($c.PublicHost)"
}
$c.AdminUser = Prompt-Value 'Admin email' $defaultEmail
# Validate email: must contain @
if (-not $c.AdminUser.Contains('@')) {
$original = $c.AdminUser
$c.AdminUser = "$($c.AdminUser)@$($c.PublicHost)"
Log-Info "Appended domain: '$original' -> '$($c.AdminUser)'"
}
} else {
$c.AdminUser = Prompt-Value 'Admin username' (Coalesce $c.AdminUser $DEFAULT_ADMIN_USER)
}
if (Prompt-YesNo 'Auto-generate admin password?' 'y') {
$c.AdminPass = ''
} else {
$c.AdminPass = Prompt-Password 'Admin password'
}
Write-Host ''
if (Prompt-YesNo 'Use custom TLS certificates? (no = self-signed)') {
$c.TlsMode = 'custom'
@@ -472,7 +496,7 @@ function Run-SimplePrompts {
} else {
$c.TlsMode = 'self-signed'
}
Write-Host ''
$c.MonitoringNetwork = Prompt-Value 'Monitoring network name (empty = skip)' ''
@@ -483,14 +507,6 @@ function Run-SimplePrompts {
$c.RegistryToken = Prompt-Password 'Registry token/password' (Coalesce $c.RegistryToken '')
}
Write-Host ''
Write-Host ' Deployment mode:'
Write-Host ' [1] Multi-tenant SaaS -- manage platform, provision tenants on demand'
Write-Host ' [2] Single-tenant -- one server instance, local auth, no identity provider'
Write-Host ''
$deployChoice = Read-Host ' Select mode [1]'
if ($deployChoice -eq '2') { $c.DeploymentMode = 'standalone' } else { $c.DeploymentMode = 'saas' }
}
function Run-ExpertPrompts {
@@ -601,7 +617,6 @@ function Validate-Config {
function Generate-Passwords {
$c = $script:cfg
if (-not $c.AdminPass) { $c.AdminPass = Generate-Password; Log-Info 'Generated admin password.' }
if (-not $c.AdminEmail) { $c.AdminEmail = "$($c.AdminUser)@$($c.PublicHost)" }
if (-not $c.PostgresPassword) { $c.PostgresPassword = Generate-Password; Log-Info 'Generated PostgreSQL password.' }
if (-not $c.ClickhousePassword) { $c.ClickhousePassword = Generate-Password; Log-Info 'Generated ClickHouse password.' }
}
@@ -712,7 +727,6 @@ POSTGRES_DB=cameleer_saas
# Admin user
SAAS_ADMIN_USER=$($c.AdminUser)
SAAS_ADMIN_EMAIL=$($c.AdminEmail)
# TLS
NODE_TLS_REJECT=$($c.NodeTlsReject)
@@ -976,7 +990,6 @@ public_host=$($c.PublicHost)
auth_host=$($c.AuthHost)
public_protocol=$($c.PublicProtocol)
admin_user=$($c.AdminUser)
admin_email=$($c.AdminEmail)
tls_mode=$($c.TlsMode)
http_port=$($c.HttpPort)
https_port=$($c.HttpsPort)
@@ -1037,7 +1050,6 @@ ClickHouse: default / $($c.ClickhousePassword)
Admin Console: $($c.PublicProtocol)://$($c.PublicHost)/platform/
Admin User: $($c.AdminUser)
Admin Password: $($c.AdminPass)
Admin Email: $($c.AdminEmail)
PostgreSQL: cameleer / $($c.PostgresPassword)
ClickHouse: default / $($c.ClickhousePassword)
@@ -1341,7 +1353,6 @@ function Print-Credentials {
}
Write-Host " Admin User: $($c.AdminUser)"
Write-Host " Admin Password: $($c.AdminPass)"
Write-Host " Admin Email: $($c.AdminEmail)"
Write-Host ''
Write-Host " PostgreSQL: cameleer / $($c.PostgresPassword)"
Write-Host " ClickHouse: default / $($c.ClickhousePassword)"