From 4ed1a1c2d6b31079b47d8a76adbbd9702fa8405d Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 11 Jun 2015 19:25:49 +0000 Subject: [PATCH 1/7] Bootstrap Debian: one dep per line --- bootstrap/_deb_common.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bootstrap/_deb_common.sh b/bootstrap/_deb_common.sh index 4e4c75b33..5348715eb 100755 --- a/bootstrap/_deb_common.sh +++ b/bootstrap/_deb_common.sh @@ -45,5 +45,15 @@ fi apt-get update apt-get install -y --no-install-recommends \ - python python-setuptools "$virtualenv" python-dev gcc swig \ - dialog libaugeas0 libssl-dev libffi-dev ca-certificates dpkg-dev + python \ + python-setuptools \ + "$virtualenv" \ + python-dev \ + gcc \ + swig \ + dialog \ + libaugeas0 \ + libssl-dev \ + libffi-dev \ + ca-certificates \ + dpkg-dev \ From 19aea3720387414747042683c0ee0df2fb80199a Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 11 Jun 2015 19:26:17 +0000 Subject: [PATCH 2/7] Bootstrap Debian: remove python-setuptools dep --- bootstrap/_deb_common.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/bootstrap/_deb_common.sh b/bootstrap/_deb_common.sh index 5348715eb..7e68c7717 100755 --- a/bootstrap/_deb_common.sh +++ b/bootstrap/_deb_common.sh @@ -46,7 +46,6 @@ fi apt-get update apt-get install -y --no-install-recommends \ python \ - python-setuptools \ "$virtualenv" \ python-dev \ gcc \ From b44014b06e7eb320656e954d2812cb9bf068f9b6 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 11 Jun 2015 19:28:15 +0000 Subject: [PATCH 3/7] Bootstrap README: deps rationale --- bootstrap/README | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bootstrap/README b/bootstrap/README index 847129c03..73564aaab 100644 --- a/bootstrap/README +++ b/bootstrap/README @@ -1,2 +1,7 @@ This directory contains scripts that install necessary OS-specific -prerequisite dependencies (see docs/using.rst). \ No newline at end of file +prerequisite dependencies (see docs/using.rst). + +General dependencies: +- git-core: requirements.txt git+https://* +- ca-certificates: communication with demo ACMO server at + https://www.letsencrypt-demo.org, requirements.txt git+https://* \ No newline at end of file From 2139971212b9e534d6593365fb92a51faff9d37d Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 11 Jun 2015 19:35:29 +0000 Subject: [PATCH 4/7] nit: add EOF newline --- bootstrap/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap/README b/bootstrap/README index 73564aaab..6a04ac0ba 100644 --- a/bootstrap/README +++ b/bootstrap/README @@ -4,4 +4,4 @@ prerequisite dependencies (see docs/using.rst). General dependencies: - git-core: requirements.txt git+https://* - ca-certificates: communication with demo ACMO server at - https://www.letsencrypt-demo.org, requirements.txt git+https://* \ No newline at end of file + https://www.letsencrypt-demo.org, requirements.txt git+https://* From 2be914f0d5ed2d3d27e49f679cd57dc7703c4a27 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 11 Jun 2015 21:06:44 +0000 Subject: [PATCH 5/7] Bootstrap Debian: add git-core dep --- bootstrap/_deb_common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap/_deb_common.sh b/bootstrap/_deb_common.sh index 7e68c7717..653daca53 100755 --- a/bootstrap/_deb_common.sh +++ b/bootstrap/_deb_common.sh @@ -45,9 +45,10 @@ fi apt-get update apt-get install -y --no-install-recommends \ + git-core \ python \ - "$virtualenv" \ python-dev \ + "$virtualenv" \ gcc \ swig \ dialog \ From 8ba51665637be5e929969e18f19504dd344f294f Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Fri, 12 Jun 2015 11:54:12 +0000 Subject: [PATCH 6/7] Vagrant: remove explicit git-core install --- Vagrantfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 7eb2b4cce..1d3b48f06 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -8,8 +8,6 @@ VAGRANTFILE_API_VERSION = "2" $ubuntu_setup_script = < Date: Fri, 12 Jun 2015 12:58:17 +0000 Subject: [PATCH 7/7] Nit: character upper case fixes. --- docs/using.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/using.rst b/docs/using.rst index 909c6eadc..01dda3ce6 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -30,14 +30,14 @@ are provided mainly for the :ref:`developers ` reference. In general: * ``sudo`` is required as a suggested way of running privileged process -* `swig`_ is required for compiling `m2crypto`_ +* `SWIG`_ is required for compiling `M2Crypto`_ .. note:: If your operating system uses SWIG 3.0.5+, you will need to run ``pip install -r requirements-swig-3.0.5.txt -r requirements.txt`` instead of the standard ``pip install -r requirements.txt``. -* `augeas`_ is required for the ``python-augeas`` bindings +* `Augeas`_ is required for the Python bindings Ubuntu @@ -90,6 +90,6 @@ The letsencrypt commandline tool has a builtin help: ./venv/bin/letsencrypt --help -.. _augeas: http://augeas.net/ -.. _m2crypto: https://github.com/M2Crypto/M2Crypto -.. _swig: http://www.swig.org/ +.. _Augeas: http://augeas.net/ +.. _M2Crypto: https://github.com/M2Crypto/M2Crypto +.. _SWIG: http://www.swig.org/