Skip to content

Commit

Permalink
Merge pull request #17 from ismail-kharrobi/DEV-FRONT
Browse files Browse the repository at this point in the history
test config
  • Loading branch information
automerge-pingpong[bot] committed Aug 23, 2023
2 parents a34febf + cd9c542 commit db033c1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ services :
- 80:80
init: true


volumes:
front:
database:
Expand Down
7 changes: 3 additions & 4 deletions nginx/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ server {
#access_log /var/log/nginx/host.access.log main;

location / {
try_files $uri /index.html;

root /var/www/html/;
index index.html index.htm;
}
Expand All @@ -14,10 +16,7 @@ server {

# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}


# proxy the PHP scripts to Apache listening on 127.0.0.1:80
#
Expand Down

0 comments on commit db033c1

Please sign in to comment.