From e2022fe0e0ff596db01b92296fc0d3e3fdaa17a9 Mon Sep 17 00:00:00 2001
From: imagine10255 <imagine10255@gmail.com>
Date: Fri, 4 Mar 2022 16:38:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20tmp=20cache,=20?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E7=B5=90=E6=A7=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                    |  5 +--
 README.md                                     | 11 ++++--
 config/nginx/conf.d/app.conf                  | 34 +++----------------
 config/nginx/{conf.d => }/default/default.crt |  0
 config/nginx/{conf.d => }/default/default.key |  0
 config/nginx/nginx.conf                       | 31 +++++++++++++++++
 package.json                                  |  2 +-
 7 files changed, 46 insertions(+), 37 deletions(-)
 rename config/nginx/{conf.d => }/default/default.crt (100%)
 rename config/nginx/{conf.d => }/default/default.key (100%)

diff --git a/Dockerfile b/Dockerfile
index de22ff9..fa16181 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -78,10 +78,7 @@ RUN echo "alias ll='ls -alF'" >> ~/.bashrc \
     && echo "alias l='ls -CF'" >> ~/.bashrc
 
 RUN mkdir /tmp/nginx/cache -p
-
-ADD ./config/nginx/nginx.conf /etc/nginx/nginx.conf
-ADD ./config/nginx/site-modules /etc/nginx/site-modules
-ADD ./config/nginx/conf.d /etc/nginx/conf.d
+ADD ./config/nginx /etc/nginx
 COPY ./public /etc/nginx/html
 
 WORKDIR /etc/nginx
diff --git a/README.md b/README.md
index c6da344..b32330b 100644
--- a/README.md
+++ b/README.md
@@ -42,10 +42,14 @@ add config to docker-compose.yml
 
 ```
 volumes:
+    - "./config/nginx/conf.d:/etc/nginx/conf.d"
+    - "/home/adminuser/service/ftp-server/data:/etc/nginx/html:ro"
+```
+
+```
+# options:
     - "./config/nginx/nginx.conf:/etc/nginx/nginx.conf"
     - "./config/nginx/site-modules:/etc/nginx/site-modules"
-    - "./config/nginx/conf.d:/etc/nginx/conf.d"
-    - "./public:/etc/nginx/html"
 ```
 
 ## Reference Architecture:
@@ -71,7 +75,8 @@ ARG ENABLED_MODULES="ndk headers-more"
 
 run build
 ```bash
-$ docker build . imagine10255/bear-docker-nginx:latest
+$ docker build . -t imagine10255/bear-docker-nginx:latest
+$ docker push imagine10255/bear-docker-nginx:latest
 ```
 
 ## Ref
diff --git a/config/nginx/conf.d/app.conf b/config/nginx/conf.d/app.conf
index 38bb422..05e91ec 100644
--- a/config/nginx/conf.d/app.conf
+++ b/config/nginx/conf.d/app.conf
@@ -1,41 +1,17 @@
-# resolver
-resolver 127.0.0.11 valid=30s;
-
-# module njs
-js_import app from app.js;
-
-# module headers-more
+# set headers
 more_set_headers 'Via-By: BEA118-255';
 
+# clear header
+more_clear_headers 'X-AspNet-Version';
+more_clear_headers 'X-Powered-By';
+
 # cache
 proxy_cache_path /tmp/nginx/cache levels=1:2 keys_zone=bear_cache:10m inactive=1d max_size=10g;
 
-
 # include sites conf
 include conf.d/bearests.com/*.conf;
 
 
 
 
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-    listen 443 default_server ssl;
-    server_name _;
-
-    ssl_certificate     conf.d/default/default.crt;
-    ssl_certificate_key conf.d/default/default.key;
-
-    location /hello {
-        js_content app.hello;
-    }
-
-    location /test.html {
-    }
-
-    location / {
-        return 444;
-    }
-}
-
 
diff --git a/config/nginx/conf.d/default/default.crt b/config/nginx/default/default.crt
similarity index 100%
rename from config/nginx/conf.d/default/default.crt
rename to config/nginx/default/default.crt
diff --git a/config/nginx/conf.d/default/default.key b/config/nginx/default/default.key
similarity index 100%
rename from config/nginx/conf.d/default/default.key
rename to config/nginx/default/default.key
diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf
index 9cea13e..c9f90fe 100644
--- a/config/nginx/nginx.conf
+++ b/config/nginx/nginx.conf
@@ -16,6 +16,7 @@ http {
     include       /etc/nginx/mime.types;
     include       /etc/nginx/site-modules/proxy.conf;
     js_path       /etc/nginx/site-modules/njs/;
+    root          /etc/nginx/html;
 
     default_type  application/octet-stream;
 
@@ -45,6 +46,36 @@ http {
     gzip_comp_level 5;
     gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php;
 
+    # resolver
+    resolver 127.0.0.11 valid=30s;
 
+    # module njs
+    js_import app from app.js;
+
+    # custom conf
     include /etc/nginx/conf.d/app.conf;
+
+
+
+    server {
+        listen 80 default_server;
+        listen [::]:80 default_server;
+        listen 443 default_server ssl;
+        server_name _;
+
+        ssl_certificate     /etc/nginx/default/default.crt;
+        ssl_certificate_key /etc/nginx/default/default.key;
+
+        location /hello {
+            js_content app.hello;
+        }
+
+        location /test.html {
+        }
+
+        location / {
+            return 444;
+        }
+    }
+
 }
diff --git a/package.json b/package.json
index ef23465..41e6147 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bear-docker-nginx",
   "description": "Add the module (njs, http_headers_more) to the official method, and provide the basic template out of the box\n\n",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "private": true,
   "author": "imagine10255@gmail.com",
   "license": "MIT",