Skip to content

Commit 3e8a707

Browse files
committed
Switch to LF line endings
1 parent 0eadba6 commit 3e8a707

File tree

2 files changed

+78
-78
lines changed

2 files changed

+78
-78
lines changed

Diff for: nginx.conf

+34-34
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
user nginx;
2-
worker_processes 1;
3-
4-
error_log /var/log/nginx/error.log warn;
5-
pid /var/run/nginx.pid;
6-
7-
8-
events {
9-
worker_connections 1024;
10-
}
11-
12-
13-
http {
14-
include /etc/nginx/mime.types;
15-
default_type application/octet-stream;
16-
17-
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
18-
'$status $body_bytes_sent "$http_referer" '
19-
'"$http_user_agent" "$http_x_forwarded_for"';
20-
21-
access_log /var/log/nginx/access.log main;
22-
23-
sendfile on;
24-
#tcp_nopush on;
25-
26-
keepalive_timeout 65;
27-
28-
gzip on;
29-
30-
brotli on;
31-
brotli_static on;
32-
33-
include /etc/nginx/conf.d/*.conf;
34-
}
1+
user nginx;
2+
worker_processes 1;
3+
4+
error_log /var/log/nginx/error.log warn;
5+
pid /var/run/nginx.pid;
6+
7+
8+
events {
9+
worker_connections 1024;
10+
}
11+
12+
13+
http {
14+
include /etc/nginx/mime.types;
15+
default_type application/octet-stream;
16+
17+
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
18+
'$status $body_bytes_sent "$http_referer" '
19+
'"$http_user_agent" "$http_x_forwarded_for"';
20+
21+
access_log /var/log/nginx/access.log main;
22+
23+
sendfile on;
24+
#tcp_nopush on;
25+
26+
keepalive_timeout 65;
27+
28+
gzip on;
29+
30+
brotli on;
31+
brotli_static on;
32+
33+
include /etc/nginx/conf.d/*.conf;
34+
}

Diff for: nginx.vh.default.conf

+44-44
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
server {
2-
listen 80;
3-
server_name localhost;
4-
5-
#charset koi8-r;
6-
#access_log /var/log/nginx/host.access.log main;
7-
8-
location / {
9-
root /usr/share/nginx/html;
10-
index index.html index.htm;
11-
}
12-
13-
#error_page 404 /404.html;
14-
15-
# redirect server error pages to the static page /50x.html
16-
#
17-
error_page 500 502 503 504 /50x.html;
18-
location = /50x.html {
19-
root /usr/share/nginx/html;
20-
}
21-
22-
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
23-
#
24-
#location ~ \.php$ {
25-
# proxy_pass http://127.0.0.1;
26-
#}
27-
28-
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
29-
#
30-
#location ~ \.php$ {
31-
# root html;
32-
# fastcgi_pass 127.0.0.1:9000;
33-
# fastcgi_index index.php;
34-
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
35-
# include fastcgi_params;
36-
#}
37-
38-
# deny access to .htaccess files, if Apache's document root
39-
# concurs with nginx's one
40-
#
41-
#location ~ /\.ht {
42-
# deny all;
43-
#}
44-
}
1+
server {
2+
listen 80;
3+
server_name localhost;
4+
5+
#charset koi8-r;
6+
#access_log /var/log/nginx/host.access.log main;
7+
8+
location / {
9+
root /usr/share/nginx/html;
10+
index index.html index.htm;
11+
}
12+
13+
#error_page 404 /404.html;
14+
15+
# redirect server error pages to the static page /50x.html
16+
#
17+
error_page 500 502 503 504 /50x.html;
18+
location = /50x.html {
19+
root /usr/share/nginx/html;
20+
}
21+
22+
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
23+
#
24+
#location ~ \.php$ {
25+
# proxy_pass http://127.0.0.1;
26+
#}
27+
28+
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
29+
#
30+
#location ~ \.php$ {
31+
# root html;
32+
# fastcgi_pass 127.0.0.1:9000;
33+
# fastcgi_index index.php;
34+
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
35+
# include fastcgi_params;
36+
#}
37+
38+
# deny access to .htaccess files, if Apache's document root
39+
# concurs with nginx's one
40+
#
41+
#location ~ /\.ht {
42+
# deny all;
43+
#}
44+
}

0 commit comments

Comments
 (0)