Skip to content

Instantly share code, notes, and snippets.

@davidtgq
davidtgq / gist:648cb7c75d5d90ccbbf32be2abd65492
Created October 2, 2017 11:37 — forked from CristinaSolana/gist:1885435
Keeping a fork up to date

1. Clone your fork:

git clone [email protected]:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream
proxy_cache_path /var/www/cache/osm levels=1:2 keys_zone=osm-tiles:100m max_size=50g inactive=7d;
location /osm/ {
access_log /var/log/nginx/tiles_access.log combined;
error_log /var/log/nginx/tiles_error.log info;
expires 7d;
proxy_cache osm-tiles;
proxy_cache_key "$request_uri";
proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
proxy_cache_lock on; # if race cond, only one request goes to OSM server
proxy_cache_valid 200 302 7d;