fix : remove USE_MY_OWN_NGINX_ORIGIN

Author: patternhelloworld

.env.example

@@ -85,6 +85,4 @@ NGINX_LOGROTATE_FILE_SIZE=1M
 
 SHARED_VOLUME_GROUP_ID=1351
 SHARED_VOLUME_GROUP_NAME=shared-volume-group
-UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=
-
-USE_MY_OWN_NGINX_ORIGIN=false
+UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=

.env.example.java

@@ -77,6 +77,4 @@
 
 SHARED_VOLUME_GROUP_ID=1351
 SHARED_VOLUME_GROUP_NAME=shared-volume-group
-UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=
-
-USE_MY_OWN_NGINX_ORIGIN=false
+UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=

.env.example.java.commercial.ssl.sample

@@ -79,6 +79,4 @@ NGINX_LOGROTATE_FILE_SIZE=1M
 
 SHARED_VOLUME_GROUP_ID=1351
 SHARED_VOLUME_GROUP_NAME=shared-volume-group
-UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=
-
-USE_MY_OWN_NGINX_ORIGIN=false
+UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=

.env.example.node

@@ -72,6 +72,4 @@ NGINX_LOGROTATE_FILE_SIZE=1M
 
 SHARED_VOLUME_GROUP_ID=1351
 SHARED_VOLUME_GROUP_NAME=shared-volume-group
-UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=
-
-USE_MY_OWN_NGINX_ORIGIN=false
+UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=

.env.example.php

@@ -79,6 +79,4 @@
 
 SHARED_VOLUME_GROUP_ID=1351
 SHARED_VOLUME_GROUP_NAME=laravel-shared-volume-group
-UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=1000
-
-USE_MY_OWN_NGINX_ORIGIN=false
+UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=1000

.gitignore

@@ -50,9 +50,9 @@
 
 /.docker/nginx/origin/nginx.conf.main.origin.customized
 
-/.docker/nginx/origin/conf.d/http/additionals/nginx.conf.origin.customized
-/.docker/nginx/origin/conf.d/http/app/nginx.conf.origin.customized
+/.docker/nginx/origin/conf.d/http/additionals/nginx.conf.prepared.origin.customized
+/.docker/nginx/origin/conf.d/http/app/nginx.conf.prepared.origin.customized
 
-/.docker/nginx/origin/conf.d/https/additionals/nginx.conf.origin.customized
-/.docker/nginx/origin/conf.d/https/app/nginx.conf.origin.customized
+/.docker/nginx/origin/conf.d/https/additionals/nginx.conf.prepared.origin.customized
+/.docker/nginx/origin/conf.d/https/app/nginx.conf.prepared.origin.customized
 

README.md

@@ -25,7 +25,6 @@
     - [APP_URL](#app_url)
     - [Important ENVs That Require Restarting NGINX](#important-envs-that-require-restarting-nginx)
   - [Upgrade](#upgrade)
-  - [Fully Customizing NGINX Configuration](#fully-customizing-nginx-configuration)
   - [NGINX Prepared Function](#nginx-prepared-function)
   - [Terms](#terms)
   - [Log Levels](#log-levels)
@@ -324,7 +323,6 @@ NGINX_LOGROTATE_FILE_SIZE
 SHARED_VOLUME_GROUP_ID # The application to the host does NOT depend on NGINX_RESTART=true. It is always applied.
 SHARED_VOLUME_GROUP_NAME # The application to the host does NOT depend on NGINX_RESTART=true. It is always applied.
 UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID # The application to the host does NOT depend on NGINX_RESTART=true. It is always applied.
-USE_MY_OWN_NGINX_ORIGIN
 ```
 
 ### Upgrade
@@ -338,35 +336,6 @@ sudo bash run.sh
 ```
 - However, as you are aware, ```NGINX_RESTART=true``` causes a short downtime. **Make sure ```NGINX_RESTART=false``` at all times**.
 
-### Fully Customizing NGINX Configuration
-
-![img.png](/documents/images/img3.png)
-
-- The ``origin`` folder is where you can modify original Nginx conf files.
-- Create the five yellow-highlighted files ending with 'conf.d.origin.customized' by copying the originals ending with 'conf.d.origin.'
-- You don't have to create all five files; just create the ones you need.
-- In the .env file, set this to 'true'
-```shell
-USE_MY_OWN_NGINX_ORIGIN=true
-# See '[IMPORTANT] ENVs that require 'NGINX_RESTART=true' above.
-NGINX_RESTART=true
-```
-- For reference, the files you just created are ignored by git, so there won't be any issues when you run the following:
-```shell
-# Check if the source codes of Runner is manipulated.
-bash check-source-integrity.sh
-```
-- Then, run ``(sudo) bash run.sh``. **Starting from v5.0.0**, if NGINX_RESTART is set to 'true', the Runner will test your configuration using ``nginx -t`` in a temporary container before recreating the NGINX container. If the test fails, the process stops, preventing any side effects on your currently running app.
-- Don't touch any file in ``.docker/nginx/template``. They are just ones in ready to be injected into the NGINX Image in Dockerfile.
-- Process of NGINX Configuration
-  - ``Origin`` -(processed with the .env)-> ``Template`` -(docker build)-> ``Docker Image`` -(running entrypoint.sh)-> ``Docker Container``
-- NGINX Logrotate 
-  - ``.docker/nginx/origin/logroate/nginx``
-- ENV Spel 
-  - A syntax that brings values from the .env file throughout the ecosystem.
-  - ``!#{ value here }`` 
-![img4.png](/documents/images/img4.png)
-
 ### Terms
 For all echo messages or properties .env, the following terms indicate...
 - BUILD (=LOAD IMAGE) : ```docker build```
@@ -545,4 +514,16 @@ git status # If any changes are detected, the source code may be corrupted, or j
         docker swarm init
         sudo bash run.sh
       ``` 
+
+### ETC
+- Process of NGINX Configuration
+  - ``Origin`` -(processed with the .env)-> ``Template`` -(docker build)-> ``Docker Image`` -(running entrypoint.sh)-> ``Docker Container``
+- NGINX Logrotate
+  - ``.docker/nginx/origin/logroate/nginx``
+- ENV Spel
+  - A syntax that brings values from the .env file throughout the ecosystem.
+  - ``!#{ value here }``
+    ![img4.png](/documents/images/img4.png)
+
+
 ---

documents/Deploy-React-Project-with-DBGR.md

@@ -123,8 +123,7 @@
     SHARED_VOLUME_GROUP_ID=1559
     SHARED_VOLUME_GROUP_NAME=mba-shared-volume-group
     UIDS_BELONGING_TO_SHARED_VOLUME_GROUP_ID=1000,1001
-    
-    USE_MY_OWN_NGINX_ORIGIN=false
+
   ```
 ### Locate your commercial SSLs in the folder ``docker-blue-green-runner/.docker/ssl``. See the comments in the ``.env`` above.  
 - For me, I have used GoDaddy, https://dearsikandarkhan.medium.com/ssl-godaddy-csr-create-on-mac-osx-4401c47fd94c .

documents/images/img3.png

@@ -266,7 +266,6 @@ cache_non_dependent_global_vars() {
   if [[ $(validate_number "$nginx_logrotate_file_number") == "false" ]]; then
     echo "[WARNING] NGINX_LOGROTATE_FILE_NUMBER in .env has an incorrect format. (value: $nginx_logrotate_file_number, correct examples: 5,10,101..., etc. Expected behavior: Logrotate won't work). However, this is NOT a serious issue. We will continue the process."
   fi
-  use_my_own_nginx_origin=$(get_value_from_env "USE_MY_OWN_NGINX_ORIGIN")
 
 }
 

use-common.sh

@@ -62,21 +62,6 @@ apply_docker_compose_volumes_onto_app_nginx_yaml(){
 
 }
 
-set_origin_file() {
-    local customized_file=$1
-    local default_file=$2
-
-    if [[ ${use_my_own_nginx_origin} = 'true' ]]; then
-      if [[ -f $customized_file ]]; then
-        echo $customized_file
-      else
-        echo $default_file
-      fi
-    else
-      echo $default_file
-    fi
-}
-
 
 save_nginx_prepared_template_from_origin(){
 
@@ -177,8 +162,7 @@ save_nginx_main_template_from_origin(){
 
    echo "[NOTICE] NGINX Main template (.docker/nginx/template/nginx.conf.main) is now being created."
 
-   local main_origin_file=$(set_origin_file ".docker/nginx/origin/nginx.conf.main.origin.customized" \
-                                       ".docker/nginx/origin/nginx.conf.main.origin")
+   local main_origin_file=".docker/nginx/origin/nginx.conf.main.origin"
 
    echo "[DEBUG] ${main_origin_file} will be processed into Template (.docker/nginx/template/nginx.conf.main)"