diff --git a/ANSIBLE/templates/README.md b/ANSIBLE/templates/README.md index ddf8b5e..3038e25 100644 --- a/ANSIBLE/templates/README.md +++ b/ANSIBLE/templates/README.md @@ -26,6 +26,38 @@ https://dev.to/nithinalias/docker-compose-install-wordpress-using-ansible-2lnh https://www.learnlinux.tv/getting-started-with-ansible-09-targeting-specific-nodes/ +#version: '3' +services: +website-WHAT_CONTAINER_NAME: +container_name: WHAT_CONTAINER_NAME +#image: yeasy/simple-web +image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0003:latest +pull_policy: always +ports: +- 'ALLOCATED_PORT:80' +restart: always +volumes: +- ./writable:/var/www/html/writable:Z +- ./apache_log:/var/log/apache2:Z +# environment: +# - APACHE_RUN_USER=1000 +# - APACHE_RUN_GROUP=1000 + networks: + - sitenet + +#networks: +# sitenet: + +networks: +sitenet: +# driver: bridge +# ipam: +# driver: default +# config: +# - subnet: 171.11.0.0/16 +## ip_range: 172.28.5.0/24 +## gateway: 172.28.5.254 + ansible-playbook --ask-become-pass --key-file ~/.ssh/ansible_worker -i inventory 57257_A000003_mermsemr_com.yml diff --git a/ANSIBLE/templates/composers/A000001/docker-compose.yml b/ANSIBLE/templates/composers/A000001/docker-compose.yml index a1b38e7..6846bc7 100644 --- a/ANSIBLE/templates/composers/A000001/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000001/docker-compose.yml @@ -1,9 +1,7 @@ -#version: '3' services: website-WHAT_CONTAINER_NAME: container_name: WHAT_CONTAINER_NAME - #image: yeasy/simple-web - image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0002:latest + image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0003:latest pull_policy: always ports: - 'ALLOCATED_PORT:80' @@ -17,15 +15,5 @@ services: networks: - sitenet -#networks: -# sitenet: - networks: sitenet: -# driver: bridge -# ipam: -# driver: default -# config: -# - subnet: 171.11.0.0/16 -## ip_range: 172.28.5.0/24 -## gateway: 172.28.5.254 \ No newline at end of file diff --git a/ANSIBLE/templates/composers/A000002/docker-compose.yml b/ANSIBLE/templates/composers/A000002/docker-compose.yml index e8b99b7..6846bc7 100644 --- a/ANSIBLE/templates/composers/A000002/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000002/docker-compose.yml @@ -1,9 +1,7 @@ -#version: '3' services: website-WHAT_CONTAINER_NAME: container_name: WHAT_CONTAINER_NAME - #image: yeasy/simple-web - image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0002:latest + image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0003:latest pull_policy: always ports: - 'ALLOCATED_PORT:80' @@ -19,10 +17,3 @@ services: networks: sitenet: -# driver: bridge -# ipam: -# driver: default -# config: -# - subnet: 171.11.0.0/16 -## ip_range: 172.11.5.0/24 -## gateway: 172.11.5.254 \ No newline at end of file diff --git a/app/Controllers/Provision.php b/app/Controllers/Provision.php index 0195b29..c1942f1 100644 --- a/app/Controllers/Provision.php +++ b/app/Controllers/Provision.php @@ -200,7 +200,7 @@ class Provision extends BaseController } private function scheduleRefreshAction(){ - $mysql = "SELECT * FROM member_product_refresh WHERE product_id IN ('A000001','A0000012') AND status =0 LIMIT 1"; + $mysql = "SELECT * FROM member_product_refresh WHERE product_id IN ('A000001','A000002') AND status =0 LIMIT 1"; $query = $this->db->query($mysql); // $num = $query->num_rows(); $provision_list = $query->getResult();