From 2667df71250e0ceb30d9ce11d7c03c46a6e6971b Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos Date: Tue, 19 Jan 2016 20:48:01 +0100 Subject: [PATCH] Add forgotten #101 speed-up in CHANGES. + doc: Add example *nginx* config for speeding-up serving of packages. + build: Explain which file to use for building standalone. [ci skip] --- CHANGES.rst | 5 +++++ README.rst | 11 +++++++++-- bin/commit-standalone.sh | 1 + bin/gen-standalone.sh | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 2c3c49d..06f0f9b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,11 @@ Changelog 1.1.10 (2016-01-19) ------------------ +Serve 1000s of packages, PGP-Sigs, skip versions starting with 'v'. + ++ #101: Speed-up server by (optionally) using the `watchdog` package + to cache results, serve packages directly from proxying-server (*Apache* , + *nginx*), and pre-compile regexes (thanks @virtuald). - #106: Support uploading PGP-signatures (thanks @mplanchard). - Package-versions parsing modifications: diff --git a/README.rst b/README.rst index 4b4d08b..788f1e5 100644 --- a/README.rst +++ b/README.rst @@ -390,9 +390,16 @@ install the ``watchdog`` package, or it can be installed by installing pip install pypi-server[cache] -If you are using a static webserver such as *Apache* or *Nginx* as +If you are using a static webserver such as *Apache* or *nginx* as a reverse-proxy for pypiserver, additional speedup can be gained by -directly serving the packages directory. +directly serving the packages directory: + +For instance, in *nginx* you may adding the following config to serve +packages-directly directly (take care not to expose "sensitive" files):: + + location /packages/ { + root /path/to/packages/parentdir; + } Using a different WSGI server diff --git a/bin/commit-standalone.sh b/bin/commit-standalone.sh index c883917..44119a3 100755 --- a/bin/commit-standalone.sh +++ b/bin/commit-standalone.sh @@ -2,6 +2,7 @@ ## ## Create an executable file and add it into `standalone` branch ## +## Invoke it directly on the commmit "tagged" for a release. ## Invoke it with any arg to avoid committing into `standalone` branch. my_dir="$(dirname "$0")" diff --git a/bin/gen-standalone.sh b/bin/gen-standalone.sh index 2545eda..7723690 100755 --- a/bin/gen-standalone.sh +++ b/bin/gen-standalone.sh @@ -1,6 +1,7 @@ #! /bin/sh ## ## Create an executable zip file. +## Invoked by `commit-standalone.sh`. set -o errexit