From 57428d010f767ea66139d981a148fb00df0fb306 Mon Sep 17 00:00:00 2001 From: Jacob Hayes Date: Thu, 6 Sep 2018 10:27:25 -0500 Subject: [PATCH] Replace .htaccess references with .htpasswd --- README.rst | 6 +++--- docker-compose.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 94db919..27eeca0 100644 --- a/README.rst +++ b/README.rst @@ -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 `_. @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index bea2b8d..89bc2cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: