From d29e4b782da8c4c6681de193a394d63779af41d5 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 14 Sep 2025 17:15:11 -0400 Subject: [PATCH] fix contents URL --- ANSIBLE/templates/composers/A000001/docker-compose.yml | 4 ++-- ANSIBLE/templates/composers/A000002/docker-compose.yml | 4 ++-- app/Controllers/Provision.php | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ANSIBLE/templates/composers/A000001/docker-compose.yml b/ANSIBLE/templates/composers/A000001/docker-compose.yml index ab1539c..9015ade 100644 --- a/ANSIBLE/templates/composers/A000001/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000001/docker-compose.yml @@ -12,8 +12,8 @@ services: environment: - PROVISION_UID=PROVISION_UID_REPLACE - TEMPLATE_NAME=TEMPLATE_NAME_REPLACE - - SITE_CONTENTS_URL=http://10.10.10.101:14700/web/contents - - SITE_CONTACT_URL=http://10.10.10.101:14700/web/contacts + - SITE_CONTENTS_URL=SITE_CONTENTS_URL_REPLACE + - SITE_CONTACT_URL=SITE_CONTACT_URL_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 ab1539c..9015ade 100644 --- a/ANSIBLE/templates/composers/A000002/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000002/docker-compose.yml @@ -12,8 +12,8 @@ services: environment: - PROVISION_UID=PROVISION_UID_REPLACE - TEMPLATE_NAME=TEMPLATE_NAME_REPLACE - - SITE_CONTENTS_URL=http://10.10.10.101:14700/web/contents - - SITE_CONTACT_URL=http://10.10.10.101:14700/web/contacts + - SITE_CONTENTS_URL=SITE_CONTENTS_URL_REPLACE + - SITE_CONTACT_URL=SITE_CONTACT_URL_REPLACE # - APACHE_RUN_USER=1000 # - APACHE_RUN_GROUP=1000 networks: diff --git a/app/Controllers/Provision.php b/app/Controllers/Provision.php index 45d05d3..4fc12b1 100644 --- a/app/Controllers/Provision.php +++ b/app/Controllers/Provision.php @@ -181,6 +181,9 @@ class Provision extends BaseController $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); $composer_template_contents = str_replace("PROVISION_IMAGE_NAME_REPLACE","registry.chiefsoft.com/pweb/pweb-01-merms-pweb0006c:latest", $composer_template_contents); + $composer_template_contents = str_replace("SITE_CONTENTS_URL_REPLACE", "http://10.10.10.101:14700/web/contents", $composer_template_contents); + $composer_template_contents = str_replace("SITE_CONTACT_URL_REPLACE", "http://10.10.10.101:14700/web/contacts", $composer_template_contents); + $templateRandom = 'P' . rand(1, 6); $composer_template_contents = str_replace("TEMPLATE_NAME_REPLACE", $templateRandom, $composer_template_contents); @@ -380,6 +383,9 @@ class Provision extends BaseController $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); $composer_template_contents = str_replace("PROVISION_IMAGE_NAME_REPLACE","registry.chiefsoft.com/pweb/pweb-01-merms-pweb0006c:latest", $composer_template_contents); + $composer_template_contents = str_replace("SITE_CONTENTS_URL_REPLACE", "http://10.10.10.101:14700/web/contents", $composer_template_contents); + $composer_template_contents = str_replace("SITE_CONTACT_URL_REPLACE", "http://10.10.10.101:14700/web/contacts", $composer_template_contents); + $templateRandom = 'P' . rand(1, 6); $composer_template_contents = str_replace("TEMPLATE_NAME_REPLACE", $templateRandom, $composer_template_contents);