MERMS/MermsProvision
1
0
Fork 0
Code Issues Pull Requests Releases Activity

var URL

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2025-09-24 10:06:57 -04:00
parent c02ab3fbc5
commit f55283c1b8
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
+5
View File
@@ -11,7 +11,12 @@ PATH_MACHINE_LOCAL='/home/chiefsoft/DevSites/MERMS/MermsProvision/ANSIBLE/parts/
REMOTE_COMPOSER_PATH='chiefsoft@10.10.10.13:/home/chiefsoft/DevSites/MERMS/MermsProvision/ANSIBLE/parts/' REMOTE_COMPOSER_PATH='chiefsoft@10.10.10.13:/home/chiefsoft/DevSites/MERMS/MermsProvision/ANSIBLE/parts/'
DESTINATION_HOME_FOLDER='/home/chiefsoft/SITES/' DESTINATION_HOME_FOLDER='/home/chiefsoft/SITES/'
# ANSIBLE PATHS *********************************************
ANSIBLE_AUTOMATION_SERVER_LOCATION="http://172.16.4.90:3000" ANSIBLE_AUTOMATION_SERVER_LOCATION="http://172.16.4.90:3000"
ANSIBLE_LOGIN_URL="/api/auth/login"
ANSIBLE_TOKEN_URL="/api/user/tokens"
ANSIBLE_TASK_URL="/api/project/"
ANSIBLE_AUTOMATION_PROJECT_ID="8" ANSIBLE_AUTOMATION_PROJECT_ID="8"
SOCKET_SERVER_LOCATION="http://10.10.10.13:5006" SOCKET_SERVER_LOCATION="http://10.10.10.13:5006"
.env.live
+4
View File
@@ -12,7 +12,11 @@ PATH_MACHINE_LOCAL='/home/chiefsoft/DevSites/MERMS/MermsProvision/ANSIBLE/parts/
REMOTE_COMPOSER_PATH='chiefsoft@10.10.10.13:/home/chiefsoft/DevSites/MERMS/MermsProvision/ANSIBLE/parts/' REMOTE_COMPOSER_PATH='chiefsoft@10.10.10.13:/home/chiefsoft/DevSites/MERMS/MermsProvision/ANSIBLE/parts/'
DESTINATION_HOME_FOLDER='/home/chiefsoft/SITES/' DESTINATION_HOME_FOLDER='/home/chiefsoft/SITES/'
# ANSIBLE PATHS *********************************************
ANSIBLE_AUTOMATION_SERVER_LOCATION="http://10.13.2.18:3000" ANSIBLE_AUTOMATION_SERVER_LOCATION="http://10.13.2.18:3000"
ANSIBLE_LOGIN_URL="/auth/login"
ANSIBLE_TOKEN_URL="/user/tokens"
ANSIBLE_TASK_URL="/project/"
ANSIBLE_AUTOMATION_PROJECT_ID="1" ANSIBLE_AUTOMATION_PROJECT_ID="1"
SOCKET_SERVER_LOCATION="http://10.13.3.15:5006" SOCKET_SERVER_LOCATION="http://10.13.3.15:5006"
app/Controllers/BaseController.php
+13 -9
View File
@@ -116,8 +116,9 @@ abstract class BaseController extends Controller
$cookies = tempnam('/tmp', 'cookie.txt'); $cookies = tempnam('/tmp', 'cookie.txt');
# 1. Login # 1. Login
$url = $base_url . "/api/auth/login"; // $url = $base_url . "/api/auth/login";
$url = $base_url . "/auth/login"; // $url = $base_url . "/auth/login";
$url = $base_url . $_ENV['ANSIBLE_LOGIN_URL'];
log_message('critical', "***** ***** Provision LOGIN URL:: " . $url); log_message('critical', "***** ***** Provision LOGIN URL:: " . $url);
$ch = curl_init($url); $ch = curl_init($url);
@@ -147,9 +148,10 @@ abstract class BaseController extends Controller
$token = "ghp5vseetodryrav77b8kfh6azuwwr-hxiky-qc3bue="; $token = "ghp5vseetodryrav77b8kfh6azuwwr-hxiky-qc3bue=";
} else { } else {
log_message('critical', "***** ***** Provision LOGIN COMPLETED :: NOW TOKEN :: "); log_message('critical', "***** ***** Provision LOGIN COMPLETED :: NOW TOKEN :: ");
# 2. Get token // # 2. Get token
$url = $base_url . "/api/user/tokens"; // $url = $base_url . "/api/user/tokens";
$url = $base_url . "/user/tokens"; // $url = $base_url . "/user/tokens";
$url = $base_url . $_ENV['ANSIBLE_TOKEN_URL'];
$ch = curl_init($url); $ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies); curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
@@ -191,8 +193,9 @@ abstract class BaseController extends Controller
//$PROJECT_ID= 8; //$PROJECT_ID= 8;
$PROJECT_ID = $_ENV['ANSIBLE_AUTOMATION_PROJECT_ID']; $PROJECT_ID = $_ENV['ANSIBLE_AUTOMATION_PROJECT_ID'];
$url = $base_url . "/api/project/$PROJECT_ID/tasks"; // $url = $base_url . "/api/project/$PROJECT_ID/tasks";
$url = $base_url . "/project/$PROJECT_ID/tasks"; // $url = $base_url . "/project/$PROJECT_ID/tasks";
$url = $base_url . $_ENV['ANSIBLE_TASK_URL'] . $PROJECT_ID . "/tasks";
log_message('critical', "***** ***** Provision CALL URL:: " . $url); log_message('critical', "***** ***** Provision CALL URL:: " . $url);
$headers = [ $headers = [
@@ -214,8 +217,9 @@ abstract class BaseController extends Controller
curl_close($ch); curl_close($ch);
# 4. Get tasks # 4. Get tasks
$url = $base_url . "/api/project/$PROJECT_ID/tasks"; // $url = $base_url . "/api/project/$PROJECT_ID/tasks";
$url = $base_url . "/project/$PROJECT_ID/tasks"; // $url = $base_url . "/project/$PROJECT_ID/tasks";
$url = $base_url . $_ENV['ANSIBLE_TASK_URL'] . $PROJECT_ID . "/tasks";
$ch = curl_init($url); $ch = curl_init($url);
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);