From 87000ac5c60eda6b8f7e4c291c53bc97a006c3e7 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Wed, 14 Oct 2015 22:24:41 -0700 Subject: [PATCH] Move docker back into "using" It seems the changes removing bootstrap from "using" weren't commited earlier, either --- docs/contributing.rst | 21 ----------- docs/using.rst | 81 +------------------------------------------ 2 files changed, 1 insertion(+), 101 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index ed74bbb60..8661b195e 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -371,24 +371,3 @@ i.e. it does not use ports. FreeBSD by default uses ``tcsh``. In order to activate virtulenv (see below), you will need a compatbile shell, e.g. ``pkg install bash && bash``. - - -Running with Docker -=================== - -Docker_ is another way to quickly obtaintesting certs. From the -server that the domain your requesting a cert for resolves to, -`install Docker`_, issue the following command: - -.. code-block:: shell - - sudo docker auth -it --rm -p 443:443 --name letsencrypt \ - -v "/etc/letsencrypt:/etc/letsencrypt" \ - -v "/var/lib/letsencrypt:/var/lib/letsencrypt" \ - quay.io/letsencrypt/letsencrypt:latest - -and follow the instructions. Your new cert will be available in -``/etc/letsencrypt/certs``. - -.. _Docker: https://docker.com -.. _`install Docker`: https://docs.docker.com/docker/userguide/ diff --git a/docs/using.rst b/docs/using.rst index 1920efe38..125aa29b3 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -68,83 +68,6 @@ By default, the following locations are searched: .. _Augeas: http://augeas.net/ .. _Virtualenv: https://virtualenv.pypa.io -Notes on OS depedencies -======================= - -OS level dependencies are managed by scripts in ``bootstrap``. Some notes -are provided here mainly for the :ref:`developers ` reference. - -In general: - -* ``sudo`` is required as a suggested way of running privileged process -* `Augeas`_ is required for the Python bindings -* ``virtualenv`` and ``pip`` are used for managing other python library - dependencies - - -Ubuntu ------- - -.. code-block:: shell - - sudo ./bootstrap/ubuntu.sh - - -Debian ------- - -.. code-block:: shell - - sudo ./bootstrap/debian.sh - -For squeeze you will need to: - -- Use ``virtualenv --no-site-packages -p python`` instead of ``-p python2``. - - -.. _`#280`: https://github.com/letsencrypt/letsencrypt/issues/280 - - -Mac OSX -------- - -.. code-block:: shell - - ./bootstrap/mac.sh - - -Fedora ------- - -.. code-block:: shell - - sudo ./bootstrap/fedora.sh - - -Centos 7 --------- - -.. code-block:: shell - - sudo ./bootstrap/centos.sh - - -FreeBSD -------- - -.. code-block:: shell - - sudo ./bootstrap/freebsd.sh - -Bootstrap script for FreeBSD uses ``pkg`` for package installation, -i.e. it does not use ports. - -FreeBSD by default uses ``tcsh``. In order to activate virtulenv (see -below), you will need a compatbile shell, e.g. ``pkg install bash && -bash``. - - - Running with Docker =================== @@ -158,12 +81,10 @@ server that the domain your requesting a cert for resolves to, sudo docker auth -it --rm -p 443:443 --name letsencrypt \ -v "/etc/letsencrypt:/etc/letsencrypt" \ -v "/var/lib/letsencrypt:/var/lib/letsencrypt" \ - quay.io/letsencrypt/letsencrypt:latest + quay.io/letsencrypt/letsencrypt:latest auth and follow the instructions. Your new cert will be available in ``/etc/letsencrypt/certs``. .. _Docker: https://docker.com .. _`install Docker`: https://docs.docker.com/docker/userguide/ - -