Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
da3e38ec
Commit
da3e38ec
authored
4 years ago
by
Dominik Hebeler
Browse files
Options
Downloads
Patches
Plain Diff
fixed read timeout in dev environment
parent
0acb98bd
No related branches found
No related tags found
3 merge requests
!1895
Development
,
!1762
Development
,
!1760
Resolve "add xdebug to docker installation"
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
config/nginx-default-dev.conf
+55
-0
55 additions, 0 deletions
config/nginx-default-dev.conf
docker-compose.yml
+1
-1
1 addition, 1 deletion
docker-compose.yml
with
56 additions
and
1 deletion
config/nginx-default-dev.conf
0 → 100644
+
55
−
0
View file @
da3e38ec
server
{
listen
80
;
server_name
localhost
;
root
/
html
/
public
;
index
index
.
php
index
.
html
index
.
htm
;
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;
location
/ {
try_files
$
uri
$
uri
/ /
index
.
php
?$
query_string
;
}
location
~ \.
php
$ {
try_files
$
uri
/
index
.
php
=
404
;
fastcgi_split_path_info
^(.+\.
php
)(/.+)$;
fastcgi_pass
phpfpm
:
9000
;
fastcgi_index
index
.
php
;
fastcgi_read_timeout
900
;
fastcgi_param
SCRIPT_FILENAME
$
document_root
$
fastcgi_script_name
;
include
fastcgi_params
;
}
#error_page 404 /404.html;
# redirect server error pages to the static page /50x.html
#
error_page
500
502
503
504
/
50
x
.
html
;
location
= /
50
x
.
html
{
root
/
usr
/
share
/
nginx
/
html
;
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
#
#location ~ \.php$ {
# proxy_pass http://127.0.0.1;
#}
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
#location ~ \.php$ {
# root html;
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
# include fastcgi_params;
#}
# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
1
View file @
da3e38ec
...
...
@@ -56,7 +56,7 @@ services:
volumes
:
-
.:/html
-
./config/nginx.conf:/etc/nginx/nginx.conf
-
./config/nginx-default.conf:/etc/nginx/conf.d/default.conf
-
./config/nginx-default
-dev
.conf:/etc/nginx/conf.d/default.conf
ports
:
-
"
8080:80"
worker
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment