myron/novacpx
1
0
Fork 0
mirror of https://github.com/myronblair/novacpx synced 2026-06-30 17:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Docker async launch, email SUBSTRING_INDEX (SQLite), postfix sudo writes

Browse Source 
- Docker app launch now runs docker compose up -d in background (nohup &)
  so the API returns immediately instead of timing out during image pulls
- EmailManager syncPostfix: replace MySQL SUBSTRING_INDEX with SQLite SUBSTR/INSTR
- EmailManager syncPostfix: write postfix files via sudo tee (www-data permission fix)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Myron Blair
2026-06-09 22:15:40 +00:00
parent b90ef41677
commit 1ac9728fd7
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panel/lib/DockerManager.php
+9 -4
View File
@@ -397,10 +397,15 @@ SH;
$yaml = $this->generateComposeYaml($appKey, $domain, $params); $yaml = $this->generateComposeYaml($appKey, $domain, $params);
$stack = $this->createStack($accountId, "{$appKey}-{$domain}", $yaml); $stack = $this->createStack($accountId, "{$appKey}-{$domain}", $yaml);
// Write stack and start it // Pull images and start stack in background (image pulls can take minutes)
$out = $this->composeAction((int)$stack['id'], 'up'); $dir = $stack['dir'];
novacpx_log('info', "DockerManager: launched {$appKey} for account {$accountId} on {$domain}"); $stackId = (int)$stack['id'];
return ['stack_id' => $stack['id'], 'dir' => $stack['dir'], 'output' => $out]; $logFile = escapeshellarg("/tmp/novacpx-stack-{$stackId}.log");
$compose = escapeshellarg("{$dir}/docker-compose.yml");
shell_exec("nohup sudo docker compose -f {$compose} up -d > {$logFile} 2>&1 &");
$this->db->execute("UPDATE docker_compose_stacks SET status='starting' WHERE id=?", [$stackId]);
novacpx_log('info', "DockerManager: launching {$appKey} for account {$accountId} on {$domain} (async)");
return ['stack_id' => $stackId, 'dir' => $dir, 'output' => 'Launching in background — refresh in a moment to see status'];
} }
private function generateComposeYaml(string $appKey, string $domain, array $p): string { private function generateComposeYaml(string $appKey, string $domain, array $p): string {
panel/lib/EmailManager.php
+16 -9
View File
@@ -87,8 +87,8 @@ class EmailManager {
$user = strstr($a['email'], '@', true); $user = strstr($a['email'], '@', true);
$mailboxes .= "{$a['email']} {$a['username']}/{$domain}/{$user}/\n"; $mailboxes .= "{$a['email']} {$a['username']}/{$domain}/{$user}/\n";
} }
file_put_contents('/etc/postfix/novacpx_mailboxes', $mailboxes); self::writePostfixFile('/etc/postfix/novacpx_mailboxes', $mailboxes);
shell_exec('postmap /etc/postfix/novacpx_mailboxes 2>/dev/null'); shell_exec('sudo postmap /etc/postfix/novacpx_mailboxes 2>/dev/null');
// Virtual alias map (forwarders) // Virtual alias map (forwarders)
$forwarders = $db->fetchAll("SELECT source, destination FROM email_forwarders"); $forwarders = $db->fetchAll("SELECT source, destination FROM email_forwarders");
@@ -96,16 +96,23 @@ class EmailManager {
foreach ($forwarders as $f) { foreach ($forwarders as $f) {
$aliases .= "{$f['source']} {$f['destination']}\n"; $aliases .= "{$f['source']} {$f['destination']}\n";
} }
file_put_contents('/etc/postfix/novacpx_aliases', $aliases); self::writePostfixFile('/etc/postfix/novacpx_aliases', $aliases);
shell_exec('postmap /etc/postfix/novacpx_aliases 2>/dev/null'); shell_exec('sudo postmap /etc/postfix/novacpx_aliases 2>/dev/null');
// Virtual domains map // Virtual domains map — SQLite-compatible (no SUBSTRING_INDEX)
$domains = $db->fetchAll("SELECT DISTINCT SUBSTRING_INDEX(email,'@',-1) as domain FROM email_accounts WHERE status='active'"); $domains = $db->fetchAll("SELECT DISTINCT SUBSTR(email, INSTR(email,'@') + 1) AS domain FROM email_accounts WHERE status='active'");
$vdomains = ''; $vdomains = '';
foreach ($domains as $d) { $vdomains .= "{$d['domain']} novacpx\n"; } foreach ($domains as $d) { $vdomains .= "{$d['domain']} novacpx\n"; }
file_put_contents('/etc/postfix/novacpx_domains', $vdomains); self::writePostfixFile('/etc/postfix/novacpx_domains', $vdomains);
shell_exec('postmap /etc/postfix/novacpx_domains 2>/dev/null'); shell_exec('sudo postmap /etc/postfix/novacpx_domains 2>/dev/null');
shell_exec('systemctl reload postfix 2>/dev/null || true'); shell_exec('sudo systemctl reload postfix 2>/dev/null || true');
}
private static function writePostfixFile(string $path, string $content): void {
$tmp = tempnam('/tmp', 'ncpx_pf_');
file_put_contents($tmp, $content);
shell_exec('sudo tee ' . escapeshellarg($path) . ' > /dev/null < ' . escapeshellarg($tmp));
@unlink($tmp);
} }
private static function hashPassword(string $password): string { private static function hashPassword(string $password): string {