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

feat: add SAAS_ADMIN_EMAIL to both installers

Browse Source 
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:
hsiegeln
2026-04-25 20:26:38 +02:00
parent b2259328d3
commit 0da26160c6
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
install.ps1
View File

@@ -100,6 +100,7 @@ $script:cfg = @{
PublicProtocol = $PublicProtocol
AdminUser = $AdminUser
AdminPass = $AdminPassword
AdminEmail = $null
TlsMode = $TlsMode
CertFile = $CertFile
KeyFile = $KeyFile
@@ -271,6 +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 } }
@@ -303,6 +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 }
@@ -598,6 +601,7 @@ 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.' }
}
@@ -708,6 +712,7 @@ POSTGRES_DB=cameleer_saas
# Admin user
SAAS_ADMIN_USER=$($c.AdminUser)
SAAS_ADMIN_EMAIL=$($c.AdminEmail)
# TLS
NODE_TLS_REJECT=$($c.NodeTlsReject)
@@ -971,6 +976,7 @@ 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)
@@ -1031,10 +1037,11 @@ 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)
$logtoLine
"@
}
@@ -1334,6 +1341,7 @@ 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)"