diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-07-22 13:10:56 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-07-22 13:10:56 +0200 |
| commit | 35074f3fe5b5f28580ec763481fc248b48426bdc (patch) | |
| tree | 05596381b404157e6739c50291510425a63114ef /srcs/nginx/src | |
| parent | 3ee123cfe9a808747342d3cad9d6447f4548a89d (diff) | |
| download | ft_services-35074f3fe5b5f28580ec763481fc248b48426bdc.tar.gz ft_services-35074f3fe5b5f28580ec763481fc248b48426bdc.tar.bz2 ft_services-35074f3fe5b5f28580ec763481fc248b48426bdc.zip | |
Fixing nginx with http/https
Diffstat (limited to 'srcs/nginx/src')
| -rwxr-xr-x | srcs/nginx/src/entrypoint.sh | 9 | ||||
| -rw-r--r-- | srcs/nginx/src/ft_services.conf | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/srcs/nginx/src/entrypoint.sh b/srcs/nginx/src/entrypoint.sh index def056a..5cab547 100755 --- a/srcs/nginx/src/entrypoint.sh +++ b/srcs/nginx/src/entrypoint.sh @@ -1,7 +1,8 @@ #!/bin/sh +/etc/init.d/sshd start -rm /etc/nginx/conf.d/default.conf -mv /root/ft_services.conf /etc/nginx/conf.d/ft_services.conf - -nginx -g "daemon off;" +nginx -t || exit 1 +nginx +sleep infinity & +wait diff --git a/srcs/nginx/src/ft_services.conf b/srcs/nginx/src/ft_services.conf index c38b728..435a12c 100644 --- a/srcs/nginx/src/ft_services.conf +++ b/srcs/nginx/src/ft_services.conf @@ -7,7 +7,7 @@ server { server_name localhost; index index.html index.htm; - root /usr/share/nginx/html; + root /www; location / { try_files $uri $uri/ =404; # if uri or uri/ not valid, 404 error @@ -17,12 +17,13 @@ server { server { listen 80; listen [::]:80; + server_name localhost; index index.html index.htm; - root /usr/share/nginx/html; + root /www; location / { try_files $uri $uri/ =404; # if uri or uri/ not valid, 404 error } - #return 301 https://$host$request_uri; + return 301 https://$host$request_uri; } |