Skip to content

Commit acc4c4c

Browse files
committed
adds submodule: headers-more-nginx-module
adds gitignore
1 parent 80d4df4 commit acc4c4c

File tree

5 files changed

+115
-58
lines changed

5 files changed

+115
-58
lines changed

.gitignore

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# babel dist
2+
/lib
3+
4+
# Numerous always-ignore extensions
5+
*.bak
6+
*.patch
7+
*.diff
8+
*.err
9+
*.orig
10+
*.log
11+
*.rej
12+
*.swo
13+
*.swp
14+
*.zip
15+
xxxx
16+
*.vi
17+
*~
18+
*.sass-cache
19+
*.lock
20+
*.rdb
21+
*.db
22+
nohup.out
23+
.nyc_output
24+
coverage.lcov
25+
package-lock.json
26+
*.tgz
27+
28+
# OS or Editor folders
29+
.DS_Store
30+
._*
31+
.cache
32+
.project
33+
.settings
34+
.tmproj
35+
*.esproj
36+
*.sublime-project
37+
*.sublime-workspace
38+
nbproject
39+
thumbs.db
40+
41+
# Folders to ignore
42+
.hg
43+
.svn
44+
.CVS
45+
.idea
46+
node_modules
47+
old/
48+
*-old/
49+
*-notrack/
50+
no-track/
51+
build/
52+
combo/
53+
reference/
54+
jscoverage_lib/
55+
temp/
56+
tmp/
57+
58+
# codecov.io
59+
coverage/

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "headers-more-nginx-module"]
2+
path = headers-more-nginx-module
3+
url = [email protected]:openresty/headers-more-nginx-module.git

headers-more-nginx-module

mainline/alpine/nginx.conf

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
user nginx;
32
worker_processes 1;
43

@@ -7,26 +6,22 @@ pid /var/run/nginx.pid;
76

87

98
events {
10-
worker_connections 1024;
9+
worker_connections 1024;
1110
}
1211

1312

1413
http {
15-
include /etc/nginx/mime.types;
16-
default_type application/octet-stream;
17-
18-
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
19-
'$status $body_bytes_sent "$http_referer" '
20-
'"$http_user_agent" "$http_x_forwarded_for"';
21-
22-
access_log /var/log/nginx/access.log main;
14+
include /etc/nginx/mime.types;
15+
default_type application/octet-stream;
2316

24-
sendfile on;
25-
#tcp_nopush on;
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"';
2620

27-
keepalive_timeout 65;
21+
access_log /var/log/nginx/access.log main;
2822

29-
#gzip on;
23+
sendfile on;
24+
keepalive_timeout 65;
3025

31-
include /etc/nginx/conf.d/*.conf;
26+
include /etc/nginx/conf.d/*.conf;
3227
}
Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
11
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-
#}
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+
# }
4444
}
45-

0 commit comments

Comments
 (0)