Commit 1666e500 by wutong

CD/CI

parent 9fc1858f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>开发文档</title> <title>Nginx</title>
<link href="https://cdn.bootcss.com/skeleton/2.0.4/skeleton.css" rel="stylesheet"> <link href="https://cdn.bootcss.com/skeleton/2.0.4/skeleton.css" rel="stylesheet">
<script src="https://cdn.bootcss.com/jquery/3.0.0-alpha1/jquery.js"></script> <script src="https://cdn.bootcss.com/jquery/3.0.0-alpha1/jquery.js"></script>
<script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script> <script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
......
...@@ -59,17 +59,6 @@ http { ...@@ -59,17 +59,6 @@ http {
text/x-cross-domain-policy; text/x-cross-domain-policy;
server {
listen 80;
server_name 111.230.84.223;
location / {
root /usr/share/nginx/html;
index index.html;
}
location = /50x.html {
root html;
}
}
server { server {
listen 80; listen 80;
...@@ -131,13 +120,25 @@ http { ...@@ -131,13 +120,25 @@ http {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://172.31.3.47:2181; proxy_pass http://172.31.3.47:2181;
} }
location = /50x.html { location = /50x.html {
root html; root html;
} }
} }
server {
listen 80;
server_name 111.230.84.223;
location / {
root /usr/share/nginx/html;
index index.html;
}
location = /50x.html {
root html;
}
}
include servers/*; include servers/*;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment