diff --git a/.env b/.env index 4e887b7..e97d592 100644 --- a/.env +++ b/.env @@ -12,6 +12,7 @@ REMOTE_COMPOSER_PATH='chiefsoft@10.10.10.13:/home/chiefsoft/DevSites/MERMS/Merms DESTINATION_HOME_FOLDER='/home/chiefsoft/SITES/' # ANSIBLE PATHS ********************************************* +ANSIBLE_LOGIN_TOKEN='' ANSIBLE_AUTOMATION_SERVER_LOCATION="http://172.16.4.90:3000" ANSIBLE_LOGIN_URL="/api/auth/login" ANSIBLE_TOKEN_URL="/api/user/tokens" diff --git a/.env.live b/.env.live index 9f11424..20a92d5 100644 --- a/.env.live +++ b/.env.live @@ -13,10 +13,11 @@ REMOTE_COMPOSER_PATH='chiefsoft@10.10.10.13:/home/chiefsoft/DevSites/MERMS/Merms DESTINATION_HOME_FOLDER='/home/chiefsoft/SITES/' # ANSIBLE PATHS ********************************************* +ANSIBLE_LOGIN_TOKEN="ghp5vseetodryrav77b8kfh6azuwwr-hxiky-qc3bue=" 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_LOGIN_URL="/api/auth/login" +ANSIBLE_TOKEN_URL="/api/user/tokens" +ANSIBLE_TASK_URL="/api/project/" ANSIBLE_AUTOMATION_PROJECT_ID="1" SOCKET_SERVER_LOCATION="http://10.13.3.15:5006" diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 6462f10..fba7d7d 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -108,6 +108,10 @@ abstract class BaseController extends Controller public function ansibleLogin(): string { $token = null; + if (isset($_ENV['ANSIBLE_LOGIN_TOKEN']) && $_ENV['ANSIBLE_LOGIN_TOKEN'] !=''){ + return $_ENV['ANSIBLE_LOGIN_TOKEN']; + } + try { // Code that might throw an exception $result = "Unhandled exception";