From a00e37f5b96cf6d0db8686503029dacc5adc35d4 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Fri, 8 Aug 2025 20:48:42 -0400 Subject: [PATCH] PROVISION UID --- ANSIBLE/templates/composers/A000001/docker-compose.yml | 2 +- ANSIBLE/templates/composers/A000002/docker-compose.yml | 2 +- ANSIBLE/templates/composers/A000003/docker-compose.yml | 2 +- ANSIBLE/templates/composers/A000004/docker-compose.yml | 2 +- ANSIBLE/templates/composers/A000005/docker-compose.yml | 2 +- app/Controllers/Provision.php | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ANSIBLE/templates/composers/A000001/docker-compose.yml b/ANSIBLE/templates/composers/A000001/docker-compose.yml index 3c37ada..9fb59bc 100644 --- a/ANSIBLE/templates/composers/A000001/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000001/docker-compose.yml @@ -10,7 +10,7 @@ services: - ./writable:/var/www/html/writable:Z - ./apache_log:/var/log/apache2:Z environment: - - PROVISION_UID=PROVISION_UID + - PROVISION_UID=PROVISION_UID_REPLACE # - APACHE_RUN_USER=1000 # - APACHE_RUN_GROUP=1000 networks: diff --git a/ANSIBLE/templates/composers/A000002/docker-compose.yml b/ANSIBLE/templates/composers/A000002/docker-compose.yml index 3c37ada..9fb59bc 100644 --- a/ANSIBLE/templates/composers/A000002/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000002/docker-compose.yml @@ -10,7 +10,7 @@ services: - ./writable:/var/www/html/writable:Z - ./apache_log:/var/log/apache2:Z environment: - - PROVISION_UID=PROVISION_UID + - PROVISION_UID=PROVISION_UID_REPLACE # - APACHE_RUN_USER=1000 # - APACHE_RUN_GROUP=1000 networks: diff --git a/ANSIBLE/templates/composers/A000003/docker-compose.yml b/ANSIBLE/templates/composers/A000003/docker-compose.yml index 1868845..01e04ed 100644 --- a/ANSIBLE/templates/composers/A000003/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000003/docker-compose.yml @@ -13,7 +13,7 @@ services: WORDPRESS_DB_USER: CNT_DB_NAME WORDPRESS_DB_PASSWORD: CNT_DB_PASS WORDPRESS_DB_NAME: CNT_DB_NAME - PROVISION_UID: PROVISION_UID + PROVISION_UID: PROVISION_UID_REPLACE networks: - wpsite diff --git a/ANSIBLE/templates/composers/A000004/docker-compose.yml b/ANSIBLE/templates/composers/A000004/docker-compose.yml index d8fe8b6..aa0d135 100644 --- a/ANSIBLE/templates/composers/A000004/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000004/docker-compose.yml @@ -13,7 +13,7 @@ services: WORDPRESS_DB_USER: CNT_DB_NAME WORDPRESS_DB_PASSWORD: CNT_DB_PASS WORDPRESS_DB_NAME: CNT_DB_NAME - PROVISION_UID: PROVISION_UID + PROVISION_UID: PROVISION_UID_REPLACE networks: - wpsite diff --git a/ANSIBLE/templates/composers/A000005/docker-compose.yml b/ANSIBLE/templates/composers/A000005/docker-compose.yml index 4dad92a..c870799 100644 --- a/ANSIBLE/templates/composers/A000005/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000005/docker-compose.yml @@ -13,7 +13,7 @@ services: WORDPRESS_DB_USER: CNT_DB_NAME WORDPRESS_DB_PASSWORD: CNT_DB_PASS WORDPRESS_DB_NAME: CNT_DB_NAME - PROVISION_UID: PROVISION_UID + PROVISION_UID: PROVISION_UID_REPLACE networks: - wpsite diff --git a/app/Controllers/Provision.php b/app/Controllers/Provision.php index dffbdaf..01c6be6 100644 --- a/app/Controllers/Provision.php +++ b/app/Controllers/Provision.php @@ -176,6 +176,7 @@ class Provision extends BaseController $composer_template_contents = str_replace("CNT_DB_NAME", $ContainerName, $composer_template_contents); $composer_template_contents = str_replace("CNT_DB_PASS", $provisionUID, $composer_template_contents); $composer_template_contents = str_replace("CNT_DB_DATA", '172.16.4.96:3307', $composer_template_contents); + $composer_template_contents = str_replace("PROVISION_UID_REPLACE", $provisionUID, $composer_template_contents); //Save to the specific path $destination_composer_path = $ansible_folder . "/parts/" . $provisionUID . "/docker-compose.yml"; @@ -369,7 +370,7 @@ class Provision extends BaseController $composer_template_contents = str_replace("CNT_DB_NAME", $ContainerName, $composer_template_contents); $composer_template_contents = str_replace("CNT_DB_PASS", $provisionUID, $composer_template_contents); $composer_template_contents = str_replace("CNT_DB_DATA", '172.16.4.96:3307', $composer_template_contents); - + $composer_template_contents = str_replace("PROVISION_UID_REPLACE", $provisionUID, $composer_template_contents); //Save to the specific path $composerFile = fopen($destination_composer_path, "w") or die("Unable to open file!"); fwrite($composerFile, $composer_template_contents);