Merge pull request #265 from ipfs/fix/early-morning

gateway: fix /ipfs on ipfs.io (oops)
ipfs · Mar 18, 2017 · 406b4e1 · 406b4e1
2 parents c334752 + fed44e6
commit 406b4e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ipfs/gateway/nginx.conf b/ipfs/gateway/nginx.conf
@@ -76,6 +76,13 @@ server {
     proxy_pass_header Server;
     proxy_read_timeout 1800s;
 
+    # just pass through /ipfs and /ipns
+    location ~ "^/(ipfs|ipns|api)(/|$)" {
+        proxy_set_header Host "";
+        proxy_set_header X-Ipfs-Gateway-Prefix "";
+        proxy_pass http://\$upstream;
+    }
+
     location /blog/ {
         rewrite "^/blog(/.*)$" \$1 break;
         proxy_set_header Host blog.ipfs.io:80;

diff --git a/ipfs/install.sh b/ipfs/install.sh
@@ -54,7 +54,7 @@ fi
 if [ ! -f "$repo/config" ]; then
   mkdir -p "$repo"
   chown -R 1000:users "$repo"
-  docker run -i -v "$repo:/data/ipfs" --entrypoint /bin/sh "ipfs:$ref" -c 'ipfs init --bits 2048'
+  docker run -i -u 1000 -v "$repo:/data/ipfs" --entrypoint /bin/sh "ipfs:$ref" -c 'ipfs init --bits 2048'
   restart=1
 fi