From 04c12a5e3807a8d75754250de29acf4136b263ff Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 11 Jul 2015 05:15:10 +0000 Subject: [PATCH] Update package references after subdirs rename for Vagrant and Docker. --- Dockerfile | 8 ++++---- docs/conf.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a045cf2ce..789e26af9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,8 +44,8 @@ COPY setup.py README.rst CHANGES.rst MANIFEST.in /opt/letsencrypt/src/ COPY letsencrypt /opt/letsencrypt/src/letsencrypt/ COPY acme /opt/letsencrypt/src/acme/ -COPY letsencrypt_apache /opt/letsencrypt/src/letsencrypt_apache/ -COPY letsencrypt_nginx /opt/letsencrypt/src/letsencrypt_nginx/ +COPY letsencrypt-apache /opt/letsencrypt/src/letsencrypt-apache/ +COPY letsencrypt-nginx /opt/letsencrypt/src/letsencrypt-nginx/ # requirements.txt not installed! @@ -53,8 +53,8 @@ RUN virtualenv --no-site-packages -p python2 /opt/letsencrypt/venv && \ /opt/letsencrypt/venv/bin/pip install \ -e /opt/letsencrypt/src/acme \ -e /opt/letsencrypt/src \ - -e /opt/letsencrypt/src/letsencrypt_apache \ - -e /opt/letsencrypt/src/letsencrypt_nginx + -e /opt/letsencrypt/src/letsencrypt-apache \ + -e /opt/letsencrypt/src/letsencrypt-nginx # install in editable mode (-e) to save space: it's not possible to # "rm -rf /opt/letsencrypt/src" (it's stays in the underlaying image); diff --git a/docs/conf.py b/docs/conf.py index 62e846a33..50359ba4e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -36,7 +36,7 @@ with codecs.open(init_fn, encoding='utf8') as fd: # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.insert(0, os.path.abspath(os.path.join(here, '..'))) -for pkg in 'acme', 'letsencrypt_apache', 'letsencrypt_nginx': +for pkg in 'acme', 'letsencrypt-apache', 'letsencrypt-nginx': sys.path.insert(0, os.path.abspath(os.path.join(here, '..', pkg))) # -- General configuration ------------------------------------------------