Merge branch 'master' into feature/ubuntu-16.04
This commit is contained in:
commit
6711fc3a6e
@ -35,14 +35,15 @@ server {
|
|||||||
location /api/v0/cat {
|
location /api/v0/cat {
|
||||||
proxy_pass http://_ipfs/api/v0/cat;
|
proxy_pass http://_ipfs/api/v0/cat;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /api/v0/add {
|
location /api/v0/add {
|
||||||
proxy_pass http://_ipfs/api/v0/add;
|
proxy_pass http://_ipfs/api/v0/add;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /api/v0/object/get {
|
location /api/v0/object/get {
|
||||||
proxy_pass http://_ipfs/api/v0/object/get;
|
proxy_pass http://_ipfs/api/v0/object/get;
|
||||||
}
|
}
|
||||||
|
location /api/v0/object/data {
|
||||||
|
proxy_pass http://_ipfs/api/v0/object/data;
|
||||||
|
}
|
||||||
|
|
||||||
<% if File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%>
|
<% if File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%>
|
||||||
ssl_certificate <%= @ssl_cert %>;
|
ssl_certificate <%= @ssl_cert %>;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user