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 WordPressManager (wrong DB class) and DockerManager (sudo install)

Browse Source
This commit is contained in:
Myron Blair
2026-06-08 12:21:06 +00:00
parent ffb623dd16
commit ae875917cb
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panel/lib/DockerManager.php
+15 -10
View File
@@ -19,19 +19,24 @@ class DockerManager {
public function install(): string { public function install(): string {
if ($this->isInstalled()) return 'Docker is already installed'; if ($this->isInstalled()) return 'Docker is already installed';
// Write install script to /tmp then run it via sudo bash (no interactive terminal needed)
$script = <<<'SH' $script = <<<'SH'
export DEBIAN_FRONTEND=noninteractive #!/bin/bash
curl -fsSL https://get.docker.com | sh set -e
systemctl enable --now docker export DEBIAN_FRONTEND=noninteractive
usermod -aG docker www-data curl -fsSL https://get.docker.com -o /tmp/ncpx-get-docker.sh
SH; bash /tmp/ncpx-get-docker.sh
rm -f /tmp/ncpx-get-docker.sh
systemctl enable --now docker
usermod -aG docker www-data
SH;
$scriptFile = '/tmp/ncpx-docker-install.sh';
file_put_contents($scriptFile, $script);
chmod($scriptFile, 0700);
$out = []; $out = [];
exec('bash -c ' . escapeshellarg($script) . ' 2>&1', $out, $rc); exec('sudo bash ' . escapeshellarg($scriptFile) . ' 2>&1', $out, $rc);
@unlink($scriptFile);
if ($rc !== 0) throw new RuntimeException("Docker install failed: " . implode("\n", $out)); if ($rc !== 0) throw new RuntimeException("Docker install failed: " . implode("\n", $out));
// Add sudoers entry so www-data can run docker without password
file_put_contents('/etc/sudoers.d/novacpx-docker',
"www-data ALL=(root) NOPASSWD: /usr/bin/docker\n");
chmod('/etc/sudoers.d/novacpx-docker', 0440);
novacpx_log('info', 'DockerManager: Docker CE installed'); novacpx_log('info', 'DockerManager: Docker CE installed');
return 'Docker installed successfully'; return 'Docker installed successfully';
} }
panel/lib/WordPressManager.php
+2 -2
View File
@@ -1,10 +1,10 @@
<?php <?php
class WordPressManager { class WordPressManager {
private PDO $db; private \PDO $db;
private string $wpcli = '/usr/local/bin/wp'; private string $wpcli = '/usr/local/bin/wp';
public function __construct() { public function __construct() {
$this->db = Database::getInstance()->getPDO(); $this->db = DB::getInstance()->pdo();
$this->ensureWpCli(); $this->ensureWpCli();
} }