Skip to content

Commit f6b85a6

Browse files
committed
update conf for current build
1 parent ff00256 commit f6b85a6

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.PHONY: test
2+
3+
test:
4+
docker-compose --file docker-compose.test.yml build
5+
docker-compose --file docker-compose.test.yml run sut

test/nginx.conf

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# * Official English Documentation: http://nginx.org/en/docs/
33
# * Official Russian Documentation: http://nginx.org/ru/docs/
44

5-
user nginx;
5+
user nobody;
66
worker_processes auto;
77

88
error_log /dev/stderr debug;
@@ -18,14 +18,14 @@ events {
1818
}
1919

2020
http {
21-
include /etc/nginx/mime.types;
21+
include mime.types;
2222
default_type application/octet-stream;
2323

2424
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
2525
'$status $body_bytes_sent "$http_referer" '
2626
'"$http_user_agent" "$http_x_forwarded_for"';
2727

28-
access_log /var/log/nginx/access.log main;
28+
access_log /usr/local/nginx/logs/access.log main;
2929

3030
sendfile on;
3131
tcp_nopush on;
@@ -40,15 +40,11 @@ http {
4040
# Load modular configuration files from the /etc/nginx/conf.d directory.
4141
# See http://nginx.org/en/docs/ngx_core_module.html#include
4242
# for more information.
43-
include /etc/nginx/conf.d/*.conf;
43+
# include /etc/nginx/conf.d/*.conf;
4444

4545
index index.html index.htm;
4646

4747
server {
48-
pagespeed on;
49-
# Needs to exist and be writable by nginx. Use tmpfs for best performance.
50-
pagespeed FileCachePath /var/cache;
51-
5248
listen 80;
5349
server_name localhost;
5450
root /usr/share/nginx/html;

0 commit comments

Comments
 (0)