From b75aa87a8491fd71fb8ab577af9bfd4cd115186d Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Tue, 28 Jan 2025 23:50:40 -0500 Subject: [PATCH] $partMachineLocal = "/home/chiefsoft/MermsProvision/ANSIBLE/parts/"; --- app/Controllers/Provision.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/Controllers/Provision.php b/app/Controllers/Provision.php index 06df993..8a09776 100644 --- a/app/Controllers/Provision.php +++ b/app/Controllers/Provision.php @@ -245,16 +245,10 @@ class Provision extends BaseController } public function releaseProvision(){ - // Use ls command with shell_exec function -//$output = shell_exec('ls -alt /var/www/html/ANSIBLE/'); -// -//// Display the list of all files and directories -//echo "
$output
"; -//log_message('critical', "Test poath -> ".$output); - //ANSIBLE/templates/A000001.yml + + $partMachineLocal = "/home/chiefsoft/MermsProvision/ANSIBLE/parts/"; $ansibleToken = $this->ansibleLogin(); - //$mysql = "SELECT id AS plan_id, uid, provision_id, play_file from provision_plans ORDER BY updated ASC LIMIT 1 "; - $mysql ="SELECT p.id AS mpid, p.product_id, pp.id AS plan_id, pp.uid, pp.provision_id, pp.play_file + $mysql ="SELECT pp.uid AS prov_uid, p.id AS mpid, p.product_id, pp.id AS plan_id, pp.uid, pp.provision_id, pp.play_file FROM provision_plans pp LEFT JOIN members_products p ON p.id =pp.provision_id ORDER BY pp.updated ASC LIMIT 1 "; @@ -266,11 +260,12 @@ class Provision extends BaseController $provisionId = $pr->provision_id; $productId = $pr->product_id; $playbook = $pr->product_id.".yml"; + $provisionUID = $pr->prov_uid; $ansible_host = $productId . "_SERVER"; $ContainerName = $productId . str_pad($pr->mpid, 10, "0", STR_PAD_LEFT); $destinationHomeFolder = "/home/chiefsoft/SITES/" . $ContainerName; - + $composer_template_path_local = $partMachineLocal . $provisionUID; $this->db->query("UPDATE provision_plans SET updated = now() WHERE id = $planId"); $this->db->query("UPDATE members_products SET p_file = p_file + 1 WHERE id = $provisionId"); @@ -282,7 +277,7 @@ class Provision extends BaseController "environment"=> "{ \"WHAT_HOST_IN_USE\":\"$ansible_host\", \"DESTINATION_FOLDER\":\"$destinationHomeFolder\", - \"WHAT_PART_LOCAL\":\"\" + \"WHAT_PART_LOCAL\":\"$composer_template_path_local\" }" ]; $this->ansibleProvision($ansibleToken, $params);