Merge remote-tracking branch 'origin/develop' into develop

.github/workflows/ci-cd.yml

@@ -135,7 +135,7 @@ jobs:
                   - \"80:80\"
                   - \"443:443\"
                 volumes:
-                  - ./nginx/nginx.conf:/etc/nginx/nginx.conf
+                  - ./nginx.conf:/etc/nginx/nginx.conf
                   - ./data/certbot/conf:/etc/letsencrypt
                   - ./data/certbot/www:/var/www/certbot
                 depends_on:

conf/nginx.conf

@@ -1,10 +1,39 @@
-server {
-     listen 80;
+events {
+    worker_connections 1024;
+}
 
-     server_name marueggserver.com;
+http {
+    upstream was {
+        server maru-egg:8080;
+    }
 
-     location /.well-known/acme-challenge/ {
-             allow all;
-             root /var/www/certbot;
-     }
-}
+    server {
+        listen 80;
+        server_name marueggserver.com;
+
+        location /.well-known/acme-challenge/ {
+            root /var/www/certbot;
+        }
+
+        location / {
+            return 301 https://$host$request_uri;
+        }
+    }
+
+    server {
+        listen 443 ssl;
+        server_name marueggserver.com;
+
+        ssl_certificate /etc/letsencrypt/live/marueggserver.com/fullchain.pem;
+        ssl_certificate_key /etc/letsencrypt/live/marueggserver.com/privkey.pem;
+        include /etc/letsencrypt/options-ssl-nginx.conf;
+        ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+        location / {
+            proxy_pass http://was;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
+}

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   maru-egg-app:
-    container_name: maru-egg
+    container_name: maru-egg-app
     image: ${DOCKER_REPO}:${IMAGE_TAG}
     ports:
       - "8080:8080"
@@ -17,7 +17,7 @@ services:
       - "80:80"
       - "443:443"
     volumes:
-      - ./conf/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx.conf:/etc/nginx/nginx.conf
       - ./data/certbot/conf:/etc/letsencrypt
       - ./data/certbot/www:/var/www/certbot
     depends_on: