Merge pull request #220 from JacobHayes/fix-htaccess-refs

Replace .htaccess references with .htpasswd
This commit is contained in:
Matthew Planchard 2018-09-06 17:02:24 -05:00 committed by GitHub
commit e23cd0333e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

@ -366,9 +366,9 @@ To serve packages from a directory on the host, e.g. ``~/packages``::
docker run -p 80:8080 -v ~/packages:/data/packages pypiserver/pypiserver:latest
To authenticate against a local ``.htaccess`` file::
To authenticate against a local ``.htpasswd`` file::
docker run -p 80:8080 -v ~/.htaccess:/data/.htaccess pypiserver/pypiserver:latest -P .htaccess packages
docker run -p 80:8080 -v ~/.htpasswd:/data/.htpasswd pypiserver/pypiserver:latest -P .htpasswd packages
You can also specify ``pypiserver`` to run as a Docker service using a
composefile. An example composefile is `provided <docker-compose.yml>`_.
@ -557,7 +557,7 @@ package and as such, it provides excellent cross-platform support for process
management. An example configuration file for ``supervisor`` is given below::
[program:pypi]
command=/home/pypi/pypi-venv/bin/pypi-server -p 7001 -P /home/pypi/.htaccess /home/pypi/packages
command=/home/pypi/pypi-venv/bin/pypi-server -p 7001 -P /home/pypi/.htpasswd /home/pypi/packages
directory=/home/pypi
user=pypi
autostart=true

@ -12,9 +12,9 @@ services:
- type: bind
source: ./data
target: /data
# Use an .htaccess file to control access, serve packages from
# Use an .htpasswd file to control access, serve packages from
# ./data (which will be /data in the container)
command: -P /data/.htaccess -a update,download,list /data/packages
command: -P /data/.htpasswd -a update,download,list /data/packages
ports:
- "80:8080"
volumes: