From f49cfc64d9c74d1c67423894fe068aa904569887 Mon Sep 17 00:00:00 2001 From: Gary Kwok Date: Mon, 11 Mar 2024 12:24:35 +0800 Subject: [PATCH] V2 --- 000-default.conf | 12 ------ Dockerfile | 13 ------- roles/demolamp/tasks/main2.yml | 49 ------------------------- roles/demolamp/vars/hkdev/env_hkdev.yml | 12 +++--- start-apache | 4 -- 5 files changed, 6 insertions(+), 84 deletions(-) delete mode 100644 000-default.conf delete mode 100644 Dockerfile delete mode 100644 roles/demolamp/tasks/main2.yml delete mode 100644 start-apache diff --git a/000-default.conf b/000-default.conf deleted file mode 100644 index e0eadd9..0000000 --- a/000-default.conf +++ /dev/null @@ -1,12 +0,0 @@ -# 000-default.conf - - - ServerAdmin webmaster@localhost - DocumentRoot /var/www/public - - - Options Indexes FollowSymLinks - AllowOverride All - Require all granted - - \ No newline at end of file diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 4dd72d2..0000000 --- a/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM php:7.4-apache - -COPY 000-default.conf /etc/apache2/sites-available/000-default.conf -COPY start-apache /usr/local/bin -RUN chmod 755 /usr/local/bin/start-apache -RUN a2enmod rewrite - -# Copy application source -RUN mkdir /var/www/public -COPY src /var/www/public -RUN chown -R www-data:www-data /var/www - -CMD ["start-apache"] \ No newline at end of file diff --git a/roles/demolamp/tasks/main2.yml b/roles/demolamp/tasks/main2.yml deleted file mode 100644 index a747538..0000000 --- a/roles/demolamp/tasks/main2.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- name: show remote host - debug: - msg: "the remote server is {{ ansible_host }}" -- name: create build dir if not exists - file: - path: "{{ build_root_abspath }}" - state: directory -- name: git clone - git: - repo: "https://pvggitea.duckdns.org/GiteaTeam/demolamp.git" - dest: "{{ build_root_abspath }}" - remote: "origin" - version: "main" - -- name: Stop a container - community.docker.docker_container: - name: demolamp - state: stopped - -- name: Remove container - community.docker.docker_container: - name: demolamp - state: absent - -- name: Remove the docker image for demolamp if exists - community.docker.docker_image: - name: "demolamp" - tag: "{{ demobackend_version }}" - state: absent - -- name: Build demolamp image - community.docker.docker_image: - name: demolamp - source: build - build: - path: "{{ build_root_abspath }}" - pull: false - tag: "{{ demobackend_version }}" - - -- name: run docker - community.docker.docker_container: - name: demolamp - state: started - recreate: yes - image: "demolamp:{{ demobackend_version }}" - ports: - - "80:80" diff --git a/roles/demolamp/vars/hkdev/env_hkdev.yml b/roles/demolamp/vars/hkdev/env_hkdev.yml index 70df794..e8de28c 100644 --- a/roles/demolamp/vars/hkdev/env_hkdev.yml +++ b/roles/demolamp/vars/hkdev/env_hkdev.yml @@ -6,15 +6,15 @@ sentinelMasterName: "mymaster_hkdev" redisha_memLimit: "2GB" redisha_nodes: - - hostname: "hkof1devrds01.ecvision.com" - ipaddr: "10.75.42.25" + - hostname: "pvgdemo1.pvg.internal" + ipaddr: "192.168.11.121" isMaster: true isReplica: false - - hostname: "hkof1devrds02.ecvision.com" - ipaddr: "10.75.42.26" + - hostname: "pvgdemo2.pvg.internal" + ipaddr: "192.168.11.122" isMaster: false isReplica: true - - hostname: "hkof1devrds03.ecvision.com" - ipaddr: "10.75.42.27" + - hostname: "pvgdemo3.pvg.internal" + ipaddr: "192.168.11.123" isMaster: false isReplica: true diff --git a/start-apache b/start-apache deleted file mode 100644 index f68e5d6..0000000 --- a/start-apache +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -sed -i "s/Listen 80/Listen ${PORT:-80}/g" /etc/apache2/ports.conf -sed -i "s/:80/:${PORT:-80}/g" /etc/apache2/sites-enabled/* -apache2-foreground \ No newline at end of file