Merge pull request #16 from S-V-23-BootCamp-Team-F/feat/#13

Feat/#13

nginx/Dockerfile

@@ -1,6 +1,4 @@
 FROM nginx:1.15.8
 
 RUN rm /etc/nginx/conf.d/default.conf
-COPY default.conf /etc/nginx/conf.d
-# COPY localhost.key /etc/nginx/conf.d
-# COPY localhost.crt /etc/nginx/conf.d
+COPY default.conf /etc/nginx/conf.d

nginx/default.conf

@@ -10,6 +10,13 @@ server {
         return 200;
     }
 
+    # nginx 작동 여부를 확인하는 html (http://cropdocter.shop/)
+    location /nginx {
+        root /usr/share/nginx/html;
+        index index.html index.htm;
+    }
+
+
     location / {
         proxy_pass http://django;
         proxy_set_header Host $host;
@@ -21,24 +28,3 @@ server {
         alias /backend/static/;
     }
 }
-
-
-# https 적용 코드 수정 중
-# server {
-#     listen 443 ssl;
-
-#     ssl_certificate     /etc/nginx/conf.d/localhost.crt;
-#     ssl_certificate_key /etc/nginx/conf.d/localhost.key;
-
-#     # access_log          /var/log/nginx/443_access.log;
-#     # error_log           /var/log/nginx/443_error.log;
-
-#     location / {
-#         proxy_set_header Host $host:$server_port;
-#         proxy_pass http://django;
-#         proxy_redirect off;
-#     }
-#     location /static/ {
-#         alias /backend/static/;
-#     }
-# }