fix: correct repoMap for orbishosting repos, fix DEPLOY_LOG path, remove dead __NOVACPX_VM__ branch, dedupe date() call, fix syntax error in define

This commit is contained in:
2026-06-23 16:35:22 +00:00
parent 72135136b7
commit 15bf427c2f
+9 -19
View File
@@ -13,8 +13,8 @@ if (!defined('WEBHOOK_SECRET')) {
echo json_encode(['error' => 'Webhook not configured']); echo json_encode(['error' => 'Webhook not configured']);
exit; exit;
} }
define('DEPLOY_QUEUE', '/tmp/jarvis-deploy-queue.txt'); define('DEPLOY_QUEUE', '/tmp/jarvis-deploy-queue.txt');
define('DEPLOY_LOG, '/var/www/jarvis/logs/deploy.log'); define('DEPLOY_LOG', '/home/orbishosting.com/logs/deploy.log');
header('Content-Type: application/json'); header('Content-Type: application/json');
@@ -28,9 +28,9 @@ if (!hash_equals($expected, $sig)) {
exit; exit;
} }
$data = json_decode($payload, true); $data = json_decode($payload, true);
$repo = $data['repository']['name'] ?? ''; $repo = $data['repository']['name'] ?? '';
$ref = $data['ref'] ?? ''; $ref = $data['ref'] ?? '';
$pusher = $data['pusher']['name'] ?? 'unknown'; $pusher = $data['pusher']['name'] ?? 'unknown';
// Only deploy on pushes to main // Only deploy on pushes to main
@@ -40,7 +40,8 @@ if ($ref !== 'refs/heads/main') {
} }
$repoMap = [ $repoMap = [
'jarvis' => '/var/www/jarvis', 'orbishosting' => '/home/orbishosting.com/public_html',
'orbis-hosting-portal' => '/home/orbis.orbishosting.com/public_html',
]; ];
if (!isset($repoMap[$repo])) { if (!isset($repoMap[$repo])) {
@@ -50,20 +51,9 @@ if (!isset($repoMap[$repo])) {
} }
$path = $repoMap[$repo]; $path = $repoMap[$repo];
$ts = date('Y-m-d H:i:s');
// NovaCPX lives on a private VM — the VM polls GitHub every minute via cron
// This webhook receipt confirms GitHub delivered the push notification
if ($path === '__NOVACPX_VM__') {
$commit = $data['after'] ?? 'HEAD';
$msg = "[" . date('Y-m-d H:i:s') . "] NovaCPX push by $pusher (commit: $commit) — VM will deploy within 1 min";
file_put_contents(DEPLOY_LOG, $msg . "\n", FILE_APPEND | LOCK_EX);
echo json_encode(['ok' => true, 'queued' => 'novacpx', 'commit' => $commit]);
exit;
}
file_put_contents(DEPLOY_QUEUE, $path . "\n", FILE_APPEND | LOCK_EX); file_put_contents(DEPLOY_QUEUE, $path . "\n", FILE_APPEND | LOCK_EX);
file_put_contents(DEPLOY_LOG, "[$ts] Queued deploy: $repo by $pusher -> $path\n", FILE_APPEND | LOCK_EX);
$msg = "[" . date('Y-m-d H:i:s') . "] Queued deploy: $repo by $pusher -> $path";
file_put_contents(DEPLOY_LOG, $msg . "\n", FILE_APPEND | LOCK_EX);
echo json_encode(['ok' => true, 'queued' => $repo, 'path' => $path]); echo json_encode(['ok' => true, 'queued' => $repo, 'path' => $path]);