diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 7abe902..c8a6880 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -29,4 +29,5 @@ services: dockerfile: Dockerfile context: './nginx' ports: - - "80:80" \ No newline at end of file + - "80:80" + diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/nginx/default.conf b/nginx/default.conf index 9c53313..007152d 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -1,12 +1,11 @@ server { listen 80; - server_name popcornmate.p-e.kr; + server_name *.amazonaws.com; autoindex_localtime on; - if ($http_x_forwarded_proto != 'https') { - return 301 https://$host$request_uri; - } + + error_log /var/log/nginx/error.log; location /api { proxy_pass http://server:8080; @@ -22,4 +21,4 @@ server { location /api/swagger-resources { proxy_pass http://server:8080/api/swagger-resources; } -} \ No newline at end of file +}