From cd43e9035bf1a368bc72536525910ca1d12367fc Mon Sep 17 00:00:00 2001 From: Erik Rose Date: Fri, 8 Jan 2016 16:26:25 -0500 Subject: [PATCH] Rename letsencrypt_auto dir to match other dirs. Originally, I had it in mind to move letsencrypt-auto inside this dir. However, now we'd like to copy it or link it to the root level, where people are used to finding it (at least for awhile). Since it would be confusing to have a letsencrypt-auto and a letsencrypt_auto right next to each other, we rename this folder. --- Dockerfile | 2 +- Dockerfile-dev | 2 +- .../Dockerfile | 4 ++-- .../build.py | 0 .../letsencrypt-auto | 2 +- .../letsencrypt-auto.template | 0 .../pieces/bootstrappers/arch_common.sh | 0 .../pieces/bootstrappers/deb_common.sh | 0 .../pieces/bootstrappers/free_bsd.sh | 0 .../pieces/bootstrappers/gentoo_common.sh | 0 .../pieces/bootstrappers/mac.sh | 0 .../pieces/bootstrappers/rpm_common.sh | 0 .../pieces/bootstrappers/suse_common.sh | 0 .../pieces/conditional_requirements.py | 0 .../pieces/fetch.py | 2 +- .../pieces/letsencrypt-auto-requirements.txt | 0 .../pieces/peep.py | 0 .../tests/__init__.py | 0 .../tests/auto_test.py | 18 +++++++++++------- .../tests/certs/ca/my-root-ca.crt.pem | 0 .../tests/certs/ca/my-root-ca.key.pem | 0 .../tests/certs/ca/my-root-ca.srl | 0 .../tests/certs/localhost/cert.pem | 0 .../tests/certs/localhost/localhost.csr.pem | 0 .../tests/certs/localhost/privkey.pem | 0 .../tests/certs/localhost/server.pem | 0 .../tests/signing.key | 0 letsencrypt_auto/__init__.py | 0 28 files changed, 17 insertions(+), 13 deletions(-) rename {letsencrypt_auto => letsencrypt-auto-source}/Dockerfile (86%) rename {letsencrypt_auto => letsencrypt-auto-source}/build.py (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/letsencrypt-auto (99%) rename {letsencrypt_auto => letsencrypt-auto-source}/letsencrypt-auto.template (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/bootstrappers/arch_common.sh (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/bootstrappers/deb_common.sh (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/bootstrappers/free_bsd.sh (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/bootstrappers/gentoo_common.sh (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/bootstrappers/mac.sh (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/bootstrappers/rpm_common.sh (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/bootstrappers/suse_common.sh (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/conditional_requirements.py (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/fetch.py (99%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/letsencrypt-auto-requirements.txt (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/pieces/peep.py (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/__init__.py (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/auto_test.py (99%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/certs/ca/my-root-ca.crt.pem (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/certs/ca/my-root-ca.key.pem (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/certs/ca/my-root-ca.srl (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/certs/localhost/cert.pem (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/certs/localhost/localhost.csr.pem (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/certs/localhost/privkey.pem (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/certs/localhost/server.pem (100%) rename {letsencrypt_auto => letsencrypt-auto-source}/tests/signing.key (100%) delete mode 100644 letsencrypt_auto/__init__.py diff --git a/Dockerfile b/Dockerfile index 65e175aec..67043edd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ WORKDIR /opt/letsencrypt # directories in its path. -COPY letsencrypt_auto/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto +COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* \ diff --git a/Dockerfile-dev b/Dockerfile-dev index 78ee0c8e0..61908d470 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -22,7 +22,7 @@ WORKDIR /opt/letsencrypt # TODO: Install non-default Python versions for tox. # TODO: Install Apache/Nginx for plugin development. -COPY letsencrypt_auto/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto +COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* \ diff --git a/letsencrypt_auto/Dockerfile b/letsencrypt-auto-source/Dockerfile similarity index 86% rename from letsencrypt_auto/Dockerfile rename to letsencrypt-auto-source/Dockerfile index 4bdb1426f..0969dfce2 100644 --- a/letsencrypt_auto/Dockerfile +++ b/letsencrypt-auto-source/Dockerfile @@ -25,9 +25,9 @@ COPY ./tests/certs/ca/my-root-ca.crt.pem /usr/local/share/ca-certificates/ RUN update-ca-certificates # Copy code: -COPY . /home/lea/letsencrypt/letsencrypt_auto +COPY . /home/lea/letsencrypt/letsencrypt-auto-source USER lea WORKDIR /home/lea -CMD ["nosetests", "-s", "letsencrypt/letsencrypt_auto/tests"] +CMD ["nosetests", "-s", "letsencrypt/letsencrypt-auto-source/tests"] diff --git a/letsencrypt_auto/build.py b/letsencrypt-auto-source/build.py similarity index 100% rename from letsencrypt_auto/build.py rename to letsencrypt-auto-source/build.py diff --git a/letsencrypt_auto/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto similarity index 99% rename from letsencrypt_auto/letsencrypt-auto rename to letsencrypt-auto-source/letsencrypt-auto index 8ab0e1b95..dfefe1c46 100755 --- a/letsencrypt_auto/letsencrypt-auto +++ b/letsencrypt-auto-source/letsencrypt-auto @@ -1731,7 +1731,7 @@ def verified_new_le_auto(get, tag, temp_dir): le_auto_dir = environ.get( 'LE_AUTO_DIR_TEMPLATE', 'https://raw.githubusercontent.com/letsencrypt/letsencrypt/%s/' - 'letsencrypt_auto/') % tag + 'letsencrypt-auto-source/') % tag write(get(le_auto_dir + 'letsencrypt-auto'), temp_dir, 'letsencrypt-auto') write(get(le_auto_dir + 'letsencrypt-auto.sig'), temp_dir, 'letsencrypt-auto.sig') write(PUBLIC_KEY, temp_dir, 'public_key.pem') diff --git a/letsencrypt_auto/letsencrypt-auto.template b/letsencrypt-auto-source/letsencrypt-auto.template similarity index 100% rename from letsencrypt_auto/letsencrypt-auto.template rename to letsencrypt-auto-source/letsencrypt-auto.template diff --git a/letsencrypt_auto/pieces/bootstrappers/arch_common.sh b/letsencrypt-auto-source/pieces/bootstrappers/arch_common.sh similarity index 100% rename from letsencrypt_auto/pieces/bootstrappers/arch_common.sh rename to letsencrypt-auto-source/pieces/bootstrappers/arch_common.sh diff --git a/letsencrypt_auto/pieces/bootstrappers/deb_common.sh b/letsencrypt-auto-source/pieces/bootstrappers/deb_common.sh similarity index 100% rename from letsencrypt_auto/pieces/bootstrappers/deb_common.sh rename to letsencrypt-auto-source/pieces/bootstrappers/deb_common.sh diff --git a/letsencrypt_auto/pieces/bootstrappers/free_bsd.sh b/letsencrypt-auto-source/pieces/bootstrappers/free_bsd.sh similarity index 100% rename from letsencrypt_auto/pieces/bootstrappers/free_bsd.sh rename to letsencrypt-auto-source/pieces/bootstrappers/free_bsd.sh diff --git a/letsencrypt_auto/pieces/bootstrappers/gentoo_common.sh b/letsencrypt-auto-source/pieces/bootstrappers/gentoo_common.sh similarity index 100% rename from letsencrypt_auto/pieces/bootstrappers/gentoo_common.sh rename to letsencrypt-auto-source/pieces/bootstrappers/gentoo_common.sh diff --git a/letsencrypt_auto/pieces/bootstrappers/mac.sh b/letsencrypt-auto-source/pieces/bootstrappers/mac.sh similarity index 100% rename from letsencrypt_auto/pieces/bootstrappers/mac.sh rename to letsencrypt-auto-source/pieces/bootstrappers/mac.sh diff --git a/letsencrypt_auto/pieces/bootstrappers/rpm_common.sh b/letsencrypt-auto-source/pieces/bootstrappers/rpm_common.sh similarity index 100% rename from letsencrypt_auto/pieces/bootstrappers/rpm_common.sh rename to letsencrypt-auto-source/pieces/bootstrappers/rpm_common.sh diff --git a/letsencrypt_auto/pieces/bootstrappers/suse_common.sh b/letsencrypt-auto-source/pieces/bootstrappers/suse_common.sh similarity index 100% rename from letsencrypt_auto/pieces/bootstrappers/suse_common.sh rename to letsencrypt-auto-source/pieces/bootstrappers/suse_common.sh diff --git a/letsencrypt_auto/pieces/conditional_requirements.py b/letsencrypt-auto-source/pieces/conditional_requirements.py similarity index 100% rename from letsencrypt_auto/pieces/conditional_requirements.py rename to letsencrypt-auto-source/pieces/conditional_requirements.py diff --git a/letsencrypt_auto/pieces/fetch.py b/letsencrypt-auto-source/pieces/fetch.py similarity index 99% rename from letsencrypt_auto/pieces/fetch.py rename to letsencrypt-auto-source/pieces/fetch.py index 2ba296ca6..8c38cfb1d 100644 --- a/letsencrypt_auto/pieces/fetch.py +++ b/letsencrypt-auto-source/pieces/fetch.py @@ -95,7 +95,7 @@ def verified_new_le_auto(get, tag, temp_dir): le_auto_dir = environ.get( 'LE_AUTO_DIR_TEMPLATE', 'https://raw.githubusercontent.com/letsencrypt/letsencrypt/%s/' - 'letsencrypt_auto/') % tag + 'letsencrypt-auto-source/') % tag write(get(le_auto_dir + 'letsencrypt-auto'), temp_dir, 'letsencrypt-auto') write(get(le_auto_dir + 'letsencrypt-auto.sig'), temp_dir, 'letsencrypt-auto.sig') write(PUBLIC_KEY, temp_dir, 'public_key.pem') diff --git a/letsencrypt_auto/pieces/letsencrypt-auto-requirements.txt b/letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt similarity index 100% rename from letsencrypt_auto/pieces/letsencrypt-auto-requirements.txt rename to letsencrypt-auto-source/pieces/letsencrypt-auto-requirements.txt diff --git a/letsencrypt_auto/pieces/peep.py b/letsencrypt-auto-source/pieces/peep.py similarity index 100% rename from letsencrypt_auto/pieces/peep.py rename to letsencrypt-auto-source/pieces/peep.py diff --git a/letsencrypt_auto/tests/__init__.py b/letsencrypt-auto-source/tests/__init__.py similarity index 100% rename from letsencrypt_auto/tests/__init__.py rename to letsencrypt-auto-source/tests/__init__.py diff --git a/letsencrypt_auto/tests/auto_test.py b/letsencrypt-auto-source/tests/auto_test.py similarity index 99% rename from letsencrypt_auto/tests/auto_test.py rename to letsencrypt-auto-source/tests/auto_test.py index 36a23e9c6..6b6f388d4 100644 --- a/letsencrypt_auto/tests/auto_test.py +++ b/letsencrypt-auto-source/tests/auto_test.py @@ -12,13 +12,22 @@ import socket import ssl from stat import S_IRUSR, S_IXUSR from subprocess import CalledProcessError, check_output, Popen, PIPE +import sys from tempfile import mkdtemp from threading import Thread from unittest import TestCase from nose.tools import eq_, nottest, ok_ -from ..build import build as build_le_auto + +@nottest +def tests_dir(): + """Return a path to the "tests" directory.""" + return dirname(abspath(__file__)) + + +sys.path.insert(0, dirname(tests_dir())) +from build import build as build_le_auto class RequestHandler(BaseHTTPRequestHandler): @@ -105,14 +114,9 @@ def serving(resources): thread.join() -@nottest -def tests_dir(): - """Return a path to the "tests" directory.""" - return dirname(abspath(__file__)) - - LE_AUTO_PATH = join(dirname(tests_dir()), 'letsencrypt-auto') + @contextmanager def ephemeral_dir(): dir = mkdtemp(prefix='le-test-') diff --git a/letsencrypt_auto/tests/certs/ca/my-root-ca.crt.pem b/letsencrypt-auto-source/tests/certs/ca/my-root-ca.crt.pem similarity index 100% rename from letsencrypt_auto/tests/certs/ca/my-root-ca.crt.pem rename to letsencrypt-auto-source/tests/certs/ca/my-root-ca.crt.pem diff --git a/letsencrypt_auto/tests/certs/ca/my-root-ca.key.pem b/letsencrypt-auto-source/tests/certs/ca/my-root-ca.key.pem similarity index 100% rename from letsencrypt_auto/tests/certs/ca/my-root-ca.key.pem rename to letsencrypt-auto-source/tests/certs/ca/my-root-ca.key.pem diff --git a/letsencrypt_auto/tests/certs/ca/my-root-ca.srl b/letsencrypt-auto-source/tests/certs/ca/my-root-ca.srl similarity index 100% rename from letsencrypt_auto/tests/certs/ca/my-root-ca.srl rename to letsencrypt-auto-source/tests/certs/ca/my-root-ca.srl diff --git a/letsencrypt_auto/tests/certs/localhost/cert.pem b/letsencrypt-auto-source/tests/certs/localhost/cert.pem similarity index 100% rename from letsencrypt_auto/tests/certs/localhost/cert.pem rename to letsencrypt-auto-source/tests/certs/localhost/cert.pem diff --git a/letsencrypt_auto/tests/certs/localhost/localhost.csr.pem b/letsencrypt-auto-source/tests/certs/localhost/localhost.csr.pem similarity index 100% rename from letsencrypt_auto/tests/certs/localhost/localhost.csr.pem rename to letsencrypt-auto-source/tests/certs/localhost/localhost.csr.pem diff --git a/letsencrypt_auto/tests/certs/localhost/privkey.pem b/letsencrypt-auto-source/tests/certs/localhost/privkey.pem similarity index 100% rename from letsencrypt_auto/tests/certs/localhost/privkey.pem rename to letsencrypt-auto-source/tests/certs/localhost/privkey.pem diff --git a/letsencrypt_auto/tests/certs/localhost/server.pem b/letsencrypt-auto-source/tests/certs/localhost/server.pem similarity index 100% rename from letsencrypt_auto/tests/certs/localhost/server.pem rename to letsencrypt-auto-source/tests/certs/localhost/server.pem diff --git a/letsencrypt_auto/tests/signing.key b/letsencrypt-auto-source/tests/signing.key similarity index 100% rename from letsencrypt_auto/tests/signing.key rename to letsencrypt-auto-source/tests/signing.key diff --git a/letsencrypt_auto/__init__.py b/letsencrypt_auto/__init__.py deleted file mode 100644 index e69de29bb..000000000