From d86ade674d72e13d7772663c2ad79c88969fbfe7 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Wed, 29 Jul 2015 19:56:44 +0000 Subject: [PATCH 1/6] include_package_data in apache and nginx plugins ref https://github.com/letsencrypt/letsencrypt/issues/625 --- letsencrypt-apache/setup.py | 1 + letsencrypt-nginx/setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/letsencrypt-apache/setup.py b/letsencrypt-apache/setup.py index fac5b6b88..39f4b68e1 100644 --- a/letsencrypt-apache/setup.py +++ b/letsencrypt-apache/setup.py @@ -20,4 +20,5 @@ setup( 'apache = letsencrypt_apache.configurator:ApacheConfigurator', ], }, + include_package_data=True, ) diff --git a/letsencrypt-nginx/setup.py b/letsencrypt-nginx/setup.py index bd8e8976d..92b974974 100644 --- a/letsencrypt-nginx/setup.py +++ b/letsencrypt-nginx/setup.py @@ -19,4 +19,5 @@ setup( 'nginx = letsencrypt_nginx.configurator:NginxConfigurator', ], }, + include_package_data=True, ) From fe237df2ccbd591c258c16554f8d7a67643bc168 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Wed, 29 Jul 2015 21:14:37 +0000 Subject: [PATCH 2/6] Update default server URI to staging. http://letsencrypt.status.io/pages/maintenance/55957a99e800baa4470002da/55b90ed12c1b61d83b0001eb --- letsencrypt/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/letsencrypt/constants.py b/letsencrypt/constants.py index 07d1965fb..34abb1dce 100644 --- a/letsencrypt/constants.py +++ b/letsencrypt/constants.py @@ -16,7 +16,7 @@ CLI_DEFAULTS = dict( "letsencrypt", "cli.ini"), ], verbose_count=-(logging.WARNING / 10), - server="https://www.letsencrypt-demo.org/acme/new-reg", + server="https://acme-staging.api.letsencrypt.org/acme/new-reg", rsa_key_size=2048, rollback_checkpoints=0, config_dir="/etc/letsencrypt", From 6a90737bbb5baa49bed19aebfa268dda772aca37 Mon Sep 17 00:00:00 2001 From: Jeff Hodges Date: Wed, 29 Jul 2015 14:54:35 -0700 Subject: [PATCH 3/6] make mktemp in integration tests work on OS X --- tests/integration/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/_common.sh b/tests/integration/_common.sh index be4e75098..6fe06b1ee 100755 --- a/tests/integration/_common.sh +++ b/tests/integration/_common.sh @@ -2,7 +2,7 @@ if [ "xxx$root" = "xxx" ]; then - root="$(mktemp -d)" + root="$(mktemp -d -t leitXXXX)" echo "Root integration tests directory: $root" fi store_flags="--config-dir $root/conf --work-dir $root/work" From 584f19fef59c63c18ea6ba701661fbc48f31d969 Mon Sep 17 00:00:00 2001 From: Jeff Hodges Date: Wed, 29 Jul 2015 15:08:22 -0700 Subject: [PATCH 4/6] add comment for mktemp for @Kuba --- tests/integration/_common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration/_common.sh b/tests/integration/_common.sh index 6fe06b1ee..8656b8518 100755 --- a/tests/integration/_common.sh +++ b/tests/integration/_common.sh @@ -2,6 +2,8 @@ if [ "xxx$root" = "xxx" ]; then + # The -t is required on OS X. It provides a template file path for + # the kernel to use. root="$(mktemp -d -t leitXXXX)" echo "Root integration tests directory: $root" fi From 06e21d3578b9b188100b745a210fe05975b0e5de Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Wed, 29 Jul 2015 15:17:37 -0700 Subject: [PATCH 5/6] Fix path for integration test. --- .travis.yml | 1 + tests/boulder-start.sh | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9076c52f5..69e53c4a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ before_install: env: global: - GOPATH=/tmp/go + - PATH=$GOPATH/bin:$PATH matrix: - TOXENV=py26 BOULDER_INTEGRATION=1 - TOXENV=py27 BOULDER_INTEGRATION=1 diff --git a/tests/boulder-start.sh b/tests/boulder-start.sh index 20f64bcce..d988d76c8 100755 --- a/tests/boulder-start.sh +++ b/tests/boulder-start.sh @@ -10,11 +10,5 @@ export GOPATH="${GOPATH:-/tmp/go}" go get -d github.com/letsencrypt/boulder/cmd/boulder cd $GOPATH/src/github.com/letsencrypt/boulder -make -j4 # Travis has 2 cores per build instance. -if [ "$1" = "amqp" ]; -then - ./start.py & -else - ./start.sh & -fi -# Hopefully start.py/start.sh bootstraps before integration test is started... +./start.py & +# Hopefully start.py bootstraps before integration test is started... From 84fe80a3477e6e555a6b4fa2e1e46820e087d27f Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 30 Jul 2015 04:13:14 +0000 Subject: [PATCH 6/6] "boulder-start.py amqp" is the default as of #637 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9076c52f5..95ce8ad86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ addons: - le.wtf install: "travis_retry pip install tox coveralls" -before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh amqp' +before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh' script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || (source .tox/$TOXENV/bin/activate && ./tests/boulder-integration.sh))' after_success: '[ "$TOXENV" == "cover" ] && coveralls'