Merge pull request #2383 from erikrose/replace-le-auto

Make the new letsencrypt-auto script the main one. [requires minor revision]

.travis.yml

@@ -72,7 +72,7 @@ addons:
   apt:
     sources:
     - augeas
-    packages:  # keep in sync with bootstrap/ubuntu.sh and Boulder
+    packages:  # Keep in sync with letsencrypt-auto-source/pieces/bootstrappers/deb_common.sh and Boulder.
     - python-dev
     - python-virtualenv
     - gcc

Dockerfile

@@ -22,8 +22,8 @@ WORKDIR /opt/letsencrypt
 # directories in its path.
 
 
-COPY bootstrap/ubuntu.sh /opt/letsencrypt/src/ubuntu.sh
+COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto
-RUN /opt/letsencrypt/src/ubuntu.sh && \
+RUN /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-only && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \
            /tmp/* \

Dockerfile-dev

@@ -22,8 +22,8 @@ WORKDIR /opt/letsencrypt
 
 # TODO: Install non-default Python versions for tox.
 # TODO: Install Apache/Nginx for plugin development.
-COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto
+COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto
-RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \
+RUN /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-only && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \
            /tmp/* \

Vagrantfile

@@ -8,7 +8,7 @@ VAGRANTFILE_API_VERSION = "2"
 $ubuntu_setup_script = <<SETUP_SCRIPT
 cd /vagrant
 ./letsencrypt-auto-source/letsencrypt-auto --os-packages-only
-./bootstrap/dev/venv.sh
+./tools/venv.sh
 SETUP_SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

bootstrap/README

@@ -1,6 +0,0 @@
-This directory contains scripts that install necessary OS-specific
-prerequisite dependencies (see docs/using.rst).
-
-General dependencies:
-- ca-certificates: communication with demo ACMO server at
-  https://www.letsencrypt-demo.org

bootstrap/_arch_common.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Tested with:
-#   - ArchLinux (x86_64)
-#
-# "python-virtualenv" is Python3, but "python2-virtualenv" provides
-# only "virtualenv2" binary, not "virtualenv" necessary in
-# ./bootstrap/dev/_common_venv.sh
-
-deps="
-  python2
-  python-virtualenv
-  gcc
-  dialog
-  augeas
-  openssl
-  libffi
-  ca-certificates
-  pkg-config
-"
-
-missing=$(pacman -T $deps)
-
-if [ "$missing" ]; then
-  pacman -S --needed $missing
-fi

bootstrap/_deb_common.sh

@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# Current version tested with:
-#
-# - Ubuntu
-#     - 14.04 (x64)
-#     - 15.04 (x64)
-# - Debian
-#     - 7.9 "wheezy" (x64)
-#     - sid (2015-10-21) (x64)
-
-# Past versions tested with:
-#
-# - Debian 8.0 "jessie" (x64)
-# - Raspbian 7.8 (armhf)
-
-# Believed not to work:
-#
-# - Debian 6.0.10 "squeeze" (x64)
-
-apt-get update
-
-# virtualenv binary can be found in different packages depending on
-# distro version (#346)
-
-virtualenv=
-if apt-cache show virtualenv > /dev/null 2>&1; then
-  virtualenv="virtualenv"
-fi
-
-if apt-cache show python-virtualenv > /dev/null 2>&1; then
-  virtualenv="$virtualenv python-virtualenv"
-fi
-
-augeas_pkg="libaugeas0 augeas-lenses"
-AUGVERSION=`apt-cache show --no-all-versions libaugeas0 | grep ^Version: | cut -d" " -f2`
-
-AddBackportRepo() {
-    # ARGS:
-    BACKPORT_NAME="$1"
-    BACKPORT_SOURCELINE="$2"
-    if ! grep -v -e ' *#' /etc/apt/sources.list | grep -q "$BACKPORT_NAME" ; then
-        # This can theoretically error if sources.list.d is empty, but in that case we don't care.
-        if ! grep -v -e ' *#' /etc/apt/sources.list.d/* 2>/dev/null | grep -q "$BACKPORT_NAME"; then
-            /bin/echo -n "Installing augeas from $BACKPORT_NAME in 3 seconds..."
-            sleep 1s
-            /bin/echo -ne "\e[0K\rInstalling augeas from $BACKPORT_NAME in 2 seconds..."
-            sleep 1s
-            /bin/echo -e "\e[0K\rInstalling augeas from $BACKPORT_NAME in 1 second ..."
-            sleep 1s
-            if echo $BACKPORT_NAME | grep -q wheezy ; then
-                /bin/echo '(Backports are only installed if explicitly requested via "apt-get install -t wheezy-backports")'
-            fi
-
-            echo $BACKPORT_SOURCELINE >> /etc/apt/sources.list.d/"$BACKPORT_NAME".list
-            apt-get update
-        fi
-    fi
-    apt-get install -y --no-install-recommends -t "$BACKPORT_NAME" $augeas_pkg
-    augeas_pkg=
-
-}
-
-
-if dpkg --compare-versions 1.0 gt "$AUGVERSION" ; then
-    if lsb_release -a | grep -q wheezy ; then
-        AddBackportRepo wheezy-backports "deb http://http.debian.net/debian wheezy-backports main"
-    elif lsb_release -a | grep -q precise ; then
-        # XXX add ARM case
-        AddBackportRepo precise-backports "deb http://archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse"
-    else
-        echo "No libaugeas0 version is available that's new enough to run the"
-        echo "Let's Encrypt apache plugin..."
-    fi
-    # XXX add a case for ubuntu PPAs
-fi
-
-apt-get install -y --no-install-recommends \
-  python \
-  python-dev \
-  $virtualenv \
-  gcc \
-  dialog \
-  $augeas_pkg \
-  libssl-dev \
-  libffi-dev \
-  ca-certificates \
-
-
-
-if ! command -v virtualenv > /dev/null ; then
-  echo Failed to install a working \"virtualenv\" command, exiting
-  exit 1
-fi

bootstrap/_gentoo_common.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-PACKAGES="
-  dev-lang/python:2.7
-  dev-python/virtualenv
-  dev-util/dialog
-  app-admin/augeas
-  dev-libs/openssl
-  dev-libs/libffi
-  app-misc/ca-certificates
-  virtual/pkgconfig"
-
-case "$PACKAGE_MANAGER" in
-  (paludis)
-    cave resolve --keep-targets if-possible $PACKAGES -x
-    ;;
-  (pkgcore)
-    pmerge --noreplace $PACKAGES
-    ;;
-  (portage|*)
-    emerge --noreplace $PACKAGES
-    ;;
-esac

bootstrap/_rpm_common.sh

@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Tested with:
-#   - Fedora 22, 23 (x64)
-#   - Centos 7 (x64: on DigitalOcean droplet)
-#   - CentOS 7 Minimal install in a Hyper-V VM
-
-if type dnf 2>/dev/null
-then
-  tool=dnf
-elif type yum 2>/dev/null
-then
-  tool=yum
-
-else
-  echo "Neither yum nor dnf found. Aborting bootstrap!"
-  exit 1
-fi
-
-# Some distros and older versions of current distros use a "python27"
-# instead of "python" naming convention. Try both conventions.
-if ! $tool install -y \
-       python \
-       python-devel \
-       python-virtualenv \
-       python-tools \
-       python-pip
-then
-  if ! $tool install -y \
-         python27 \
-         python27-devel \
-         python27-virtualenv \
-         python27-tools \
-         python27-pip
-  then
-    echo "Could not install Python dependencies. Aborting bootstrap!"
-    exit 1
-  fi
-fi
-
-if ! $tool install -y \
-       gcc \
-       dialog \
-       augeas-libs \
-       openssl-devel \
-       libffi-devel \
-       redhat-rpm-config \
-       ca-certificates
-then
-    echo "Could not install additional dependencies. Aborting bootstrap!"
-    exit 1
-fi
-
-
-if $tool list installed "httpd" >/dev/null 2>&1; then
-  if ! $tool install -y mod_ssl
-  then
-    echo "Apache found, but mod_ssl could not be installed."
-  fi
-fi

bootstrap/_suse_common.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# SLE12 don't have python-virtualenv
-
-zypper -nq in -l \
-  python \
-  python-devel \
-  python-virtualenv \
-  gcc \
-  dialog \
-  augeas-lenses \
-  libopenssl-devel \
-  libffi-devel \
-  ca-certificates \

bootstrap/archlinux.sh

@@ -1 +0,0 @@
-_arch_common.sh

bootstrap/centos.sh

@@ -1 +0,0 @@
-_rpm_common.sh

bootstrap/debian.sh

@@ -1 +0,0 @@
-_deb_common.sh

bootstrap/dev/README

@@ -1 +0,0 @@
-This directory contains developer setup.

bootstrap/fedora.sh

@@ -1 +0,0 @@
-_rpm_common.sh

bootstrap/freebsd.sh

@@ -1,7 +0,0 @@
-#!/bin/sh -xe
-
-pkg install -Ay \
-  python \
-  py27-virtualenv \
-  augeas \
-  libffi \

bootstrap/gentoo.sh

@@ -1 +0,0 @@
-_gentoo_common.sh

bootstrap/install-deps.sh

@@ -1,46 +0,0 @@
-#!/bin/sh -e
-#
-# Install OS dependencies.  In the glorious future, letsencrypt-auto will
-# source this...
-
-if test "`id -u`" -ne "0" ; then
-  SUDO=sudo
-else
-  SUDO=
-fi
-
-BOOTSTRAP=`dirname $0`
-if [ ! -f $BOOTSTRAP/debian.sh ] ; then
-  echo "Cannot find the letsencrypt bootstrap scripts in $BOOTSTRAP"
-  exit 1
-fi
-if [ -f /etc/debian_version ] ; then
-  echo "Bootstrapping dependencies for Debian-based OSes..."
-  $SUDO $BOOTSTRAP/_deb_common.sh
-elif [ -f /etc/arch-release ] ; then
-  echo "Bootstrapping dependencies for Archlinux..."
-  $SUDO $BOOTSTRAP/archlinux.sh
-elif [ -f /etc/redhat-release ] ; then
-  echo "Bootstrapping dependencies for RedHat-based OSes..."
-  $SUDO $BOOTSTRAP/_rpm_common.sh
-elif [ -f /etc/gentoo-release ] ; then
-  echo "Bootstrapping dependencies for Gentoo-based OSes..."
-  $SUDO $BOOTSTRAP/_gentoo_common.sh
-elif uname | grep -iq FreeBSD ; then
-  echo "Bootstrapping dependencies for FreeBSD..."
-  $SUDO $BOOTSTRAP/freebsd.sh
-elif `grep -qs openSUSE /etc/os-release` ; then
-  echo "Bootstrapping dependencies for openSUSE.."
-  $SUDO $BOOTSTRAP/suse.sh
-elif uname | grep -iq Darwin ; then
-  echo "Bootstrapping dependencies for Mac OS X..."
-  echo "WARNING: Mac support is very experimental at present..."
-  $BOOTSTRAP/mac.sh
-else
-  echo "Sorry, I don't know how to bootstrap Let's Encrypt on your operating system!"
-  echo
-  echo "You will need to bootstrap, configure virtualenv, and run a pip install manually"
-  echo "Please see https://letsencrypt.readthedocs.org/en/latest/contributing.html#prerequisites"
-  echo "for more info"
-  exit 1
-fi

bootstrap/mac.sh

@@ -1,18 +0,0 @@
-#!/bin/sh -e
-if ! hash brew 2>/dev/null; then
-    echo "Homebrew Not Installed\nDownloading..."
-    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-fi
-
-brew install augeas
-brew install dialog
-
-if ! hash pip 2>/dev/null; then
-    echo "pip Not Installed\nInstalling python from Homebrew..."
-    brew install python
-fi
-
-if ! hash virtualenv 2>/dev/null; then
-    echo "virtualenv Not Installed\nInstalling with pip"
-    pip install virtualenv
-fi

bootstrap/manjaro.sh

@@ -1 +0,0 @@
-_arch_common.sh

bootstrap/suse.sh

@@ -1 +0,0 @@
-_suse_common.sh

bootstrap/ubuntu.sh

@@ -1 +0,0 @@
-_deb_common.sh

bootstrap/venv.sh

@@ -1,33 +0,0 @@
-#!/bin/sh -e
-#
-# Installs and updates letencrypt virtualenv
-#
-# USAGE: source ./dev/venv.sh
-
-
-XDG_DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
-VENV_NAME="letsencrypt"
-VENV_PATH=${VENV_PATH:-"$XDG_DATA_HOME/$VENV_NAME"}
-
-# virtualenv call is not idempotent: it overwrites pip upgraded in
-# later steps, causing "ImportError: cannot import name unpack_url"
-if [ ! -d $VENV_PATH ]
-then
-  virtualenv --no-site-packages --python ${LE_PYTHON:-python2} $VENV_PATH
-fi
-
-. $VENV_PATH/bin/activate
-pip install -U setuptools
-pip install -U pip
-
-pip install -U letsencrypt letsencrypt-apache # letsencrypt-nginx
-
-echo
-echo "Congratulations, Let's Encrypt has been successfully installed/updated!"
-echo
-printf "%s" "Your prompt should now be prepended with ($VENV_NAME). Next "
-printf "time, if the prompt is different, 'source' this script again "
-printf "before running 'letsencrypt'."
-echo
-echo
-echo "You can now run 'letsencrypt --help'."

docs/contributing.rst

@@ -23,7 +23,7 @@ once:
    git clone https://github.com/letsencrypt/letsencrypt
    cd letsencrypt
    ./letsencrypt-auto-source/letsencrypt-auto --os-packages-only
-   ./bootstrap/dev/venv.sh
+   ./tools/venv.sh
 
 Then in each shell where you're working on the client, do:
 
@@ -300,7 +300,7 @@ Steps:
 
 1. Write your code!
 2. Make sure your environment is set up properly and that you're in your
-   virtualenv. You can do this by running ``./bootstrap/dev/venv.sh``.
+   virtualenv. You can do this by running ``./tools/venv.sh``.
    (this is a **very important** step)
 3. Run ``./pep8.travis.sh`` to do a cursory check of your code style.
    Fix any errors.

docs/using.rst

@@ -16,27 +16,12 @@ letsencrypt-auto
 ----------------
 
 ``letsencrypt-auto`` is a wrapper which installs some dependencies
-from your OS standard package repositories (e.g using `apt-get` or
+from your OS standard package repositories (e.g. using `apt-get` or
 `yum`), and for other dependencies it sets up a virtualized Python
 environment with packages downloaded from PyPI [#venv]_. It also
 provides automated updates.
 
-Firstly, please `install Git`_ and run the following commands:
+To install and run the client, just type...
-
-.. code-block:: shell
-
-   git clone https://github.com/letsencrypt/letsencrypt
-   cd letsencrypt
-
-
-.. _`install Git`: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git
-
-.. note:: On RedHat/CentOS 6 you will need to enable the EPEL_
-   repository before install.
-
-.. _EPEL: http://fedoraproject.org/wiki/EPEL
-
-To install and run the client you just need to type:
 
 .. code-block:: shell
 

letsencrypt-auto

@@ -1,202 +0,0 @@
-#!/bin/sh -e
-#
-# A script to run the latest release version of the Let's Encrypt in a
-# virtual environment
-#
-# Installs and updates the letencrypt virtualenv, and runs letsencrypt
-# using that virtual environment.  This allows the client to function decently
-# without requiring specific versions of its dependencies from the operating
-# system.
-
-# Note: you can set XDG_DATA_HOME or VENV_PATH before running this script,
-# if you want to change where the virtual environment will be installed
-XDG_DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
-VENV_NAME="letsencrypt"
-VENV_PATH=${VENV_PATH:-"$XDG_DATA_HOME/$VENV_NAME"}
-VENV_BIN=${VENV_PATH}/bin
-# The path to the letsencrypt-auto script.  Everything that uses these might
-# at some point be inlined...
-LEA_PATH=`dirname "$0"`
-BOOTSTRAP=${LEA_PATH}/bootstrap
-
-# This script takes the same arguments as the main letsencrypt program, but it
-# additionally responds to --verbose (more output) and --debug (allow support
-# for experimental platforms)
-for arg in "$@" ; do
-  # This first clause is redundant with the third, but hedging on portability
-  if [ "$arg" = "-v" ] || [ "$arg" = "--verbose" ] || echo "$arg" | grep -E -- "-v+$" ; then
-    VERBOSE=1
-  elif [ "$arg" = "--debug" ] ; then
-    DEBUG=1
-  fi
-done
-
-# letsencrypt-auto needs root access to bootstrap OS dependencies, and
-# letsencrypt itself needs root access for almost all modes of operation
-# The "normal" case is that sudo is used for the steps that need root, but
-# this script *can* be run as root (not recommended), or fall back to using
-# `su`
-if test "`id -u`" -ne "0" ; then
-  if command -v sudo 1>/dev/null 2>&1; then
-    SUDO=sudo
-  else
-    echo \"sudo\" is not available, will use \"su\" for installation steps...
-    # Because the parameters in `su -c` has to be a string,
-    # we need properly escape it
-    su_sudo() {
-      args=""
-      # This `while` loop iterates over all parameters given to this function.
-      # For each parameter, all `'` will be replace by `'"'"'`, and the escaped string
-      # will be wrapped in a pair of `'`, then appended to `$args` string
-      # For example, `echo "It's only 1\$\!"` will be escaped to:
-      #   'echo' 'It'"'"'s only 1$!'
-      #     │       │└┼┘│
-      #     │       │ │ └── `'s only 1$!'` the literal string
-      #     │       │ └── `\"'\"` is a single quote (as a string)
-      #     │       └── `'It'`, to be concatenated with the strings following it
-      #     └── `echo` wrapped in a pair of `'`, it's totally fine for the shell command itself
-      while [ $# -ne 0 ]; do
-        args="$args'$(printf "%s" "$1" | sed -e "s/'/'\"'\"'/g")' "
-        shift
-      done
-      su root -c "$args"
-    }
-    SUDO=su_sudo
-  fi
-else
-  SUDO=
-fi
-
-ExperimentalBootstrap() {
-  # Arguments: Platform name, boostrap script name, SUDO command (iff needed)
-  if [ "$DEBUG" = 1 ] ; then
-    if [ "$2" != "" ]  ; then
-      echo "Bootstrapping dependencies for $1..."
-      if [ "$3" != "" ] ; then
-        "$3" "$BOOTSTRAP/$2"
-      else
-        "$BOOTSTRAP/$2"
-      fi
-    fi
-  else
-    echo "WARNING: $1 support is very experimental at present..."
-    echo "if you would like to work on improving it, please ensure you have backups"
-    echo "and then run this script again with the --debug flag!"
-    exit 1
-  fi
-}
-
-DeterminePythonVersion() {
-  if command -v python2.7 > /dev/null ; then
-    export LE_PYTHON=${LE_PYTHON:-python2.7}
-  elif command -v python27 > /dev/null ; then
-    export LE_PYTHON=${LE_PYTHON:-python27}
-  elif command -v python2 > /dev/null ; then
-    export LE_PYTHON=${LE_PYTHON:-python2}
-  elif command -v python > /dev/null ; then
-    export LE_PYTHON=${LE_PYTHON:-python}
-  else
-    echo "Cannot find any Pythons... please install one!"
-    exit 1
-  fi
-
-  PYVER=`$LE_PYTHON --version 2>&1 | cut -d" " -f 2 | cut -d. -f1,2 | sed 's/\.//'`
-  if [ $PYVER -lt 26 ] ; then
-    echo "You have an ancient version of Python entombed in your operating system..."
-    echo "This isn't going to work; you'll need at least version 2.6."
-    exit 1
-  fi
-}
-
-
-# virtualenv call is not idempotent: it overwrites pip upgraded in
-# later steps, causing "ImportError: cannot import name unpack_url"
-if [ ! -d $VENV_PATH ]
-then
-  if [ ! -f $BOOTSTRAP/debian.sh ] ; then
-    echo "Cannot find the letsencrypt bootstrap scripts in $BOOTSTRAP"
-    exit 1
-  fi
-
-  if [ -f /etc/debian_version ] ; then
-    echo "Bootstrapping dependencies for Debian-based OSes..."
-    $SUDO $BOOTSTRAP/_deb_common.sh
-  elif [ -f /etc/redhat-release ] ; then
-    echo "Bootstrapping dependencies for RedHat-based OSes..."
-    $SUDO $BOOTSTRAP/_rpm_common.sh
-  elif `grep -q openSUSE /etc/os-release` ; then
-    echo "Bootstrapping dependencies for openSUSE-based OSes..."
-    $SUDO $BOOTSTRAP/_suse_common.sh
-  elif [ -f /etc/arch-release ] ; then
-    if [ "$DEBUG" = 1 ] ; then
-      echo "Bootstrapping dependencies for Archlinux..."
-      $SUDO $BOOTSTRAP/archlinux.sh
-    else
-      echo "Please use pacman to install letsencrypt packages:"
-      echo "# pacman -S letsencrypt letsencrypt-apache"
-      echo
-      echo "If you would like to use the virtualenv way, please run the script again with the"
-      echo "--debug flag."
-      exit 1
-    fi
-  elif [ -f /etc/manjaro-release ] ; then
-    ExperimentalBootstrap "Manjaro Linux" manjaro.sh "$SUDO"
-  elif [ -f /etc/gentoo-release ] ; then
-    ExperimentalBootstrap "Gentoo" _gentoo_common.sh "$SUDO"
-  elif uname | grep -iq FreeBSD ; then
-    ExperimentalBootstrap "FreeBSD" freebsd.sh "$SUDO"
-  elif uname | grep -iq Darwin ; then
-    ExperimentalBootstrap "Mac OS X" mac.sh # homebrew doesn't normally run as root
-  elif grep -iq "Amazon Linux" /etc/issue ; then
-    ExperimentalBootstrap "Amazon Linux" _rpm_common.sh "$SUDO"
-  else
-    echo "Sorry, I don't know how to bootstrap Let's Encrypt on your operating system!"
-    echo
-    echo "You will need to bootstrap, configure virtualenv, and run a pip install manually"
-    echo "Please see https://letsencrypt.readthedocs.org/en/latest/contributing.html#prerequisites"
-    echo "for more info"
-  fi
-
-  DeterminePythonVersion
-  echo "Creating virtual environment..."
-  if [ "$VERBOSE" = 1 ] ; then
-    virtualenv --no-site-packages --python $LE_PYTHON $VENV_PATH
-  else
-    virtualenv --no-site-packages --python $LE_PYTHON $VENV_PATH > /dev/null
-  fi
-else
-  DeterminePythonVersion
-fi
-
-
-printf "Updating letsencrypt and virtual environment dependencies..."
-if [ "$VERBOSE" = 1 ]  ; then
-  echo
-  $VENV_BIN/pip install -U setuptools
-  $VENV_BIN/pip install -U pip
-  $VENV_BIN/pip install -U letsencrypt letsencrypt-apache
-  # nginx is buggy / disabled for now, but upgrade it if the user has
-  # installed it manually
-  if $VENV_BIN/pip freeze | grep -q letsencrypt-nginx ; then
-    $VENV_BIN/pip install -U letsencrypt letsencrypt-nginx
-  fi
-else
-  $VENV_BIN/pip install -U setuptools > /dev/null
-  printf .
-  $VENV_BIN/pip install -U pip > /dev/null
-  printf .
-  # nginx is buggy / disabled for now...
-  $VENV_BIN/pip install -U letsencrypt > /dev/null
-  printf .
-  $VENV_BIN/pip install -U letsencrypt-apache > /dev/null
-  if $VENV_BIN/pip freeze | grep -q letsencrypt-nginx ; then
-    printf .
-    $VENV_BIN/pip install -U letsencrypt-nginx > /dev/null
-  fi
-  echo
-fi
-
-# Explain what's about to happen, for the benefit of those getting sudo
-# password prompts...
-echo "Requesting root privileges to run with virtualenv:" $SUDO $VENV_BIN/letsencrypt "$@"
-$SUDO $VENV_BIN/letsencrypt "$@"

letsencrypt-auto

@@ -0,0 +1 @@
+letsencrypt-auto-source/letsencrypt-auto

letsencrypt-auto-source/letsencrypt-auto

@@ -290,7 +290,7 @@ BootstrapArchCommon() {
   #
   # "python-virtualenv" is Python3, but "python2-virtualenv" provides
   # only "virtualenv2" binary, not "virtualenv" necessary in
-  # ./bootstrap/dev/_common_venv.sh
+  # ./tools/_venv_common.sh
 
   deps="
     python2

letsencrypt-auto-source/pieces/bootstrappers/arch_common.sh

@@ -4,7 +4,7 @@ BootstrapArchCommon() {
   #
   # "python-virtualenv" is Python3, but "python2-virtualenv" provides
   # only "virtualenv2" binary, not "virtualenv" necessary in
-  # ./bootstrap/dev/_common_venv.sh
+  # ./tools/_venv_common.sh
 
   deps="
     python2

tests/letstest/scripts/test_apache2.sh

@@ -35,22 +35,16 @@ then
     #sudo cp /etc/httpd/sites-available/$PUBLIC_HOSTNAME.conf /etc/httpd/sites-enabled/
 fi
 
-# run letsencrypt-apache2 via letsencrypt-auto
+# Run letsencrypt-apache2.
 cd letsencrypt
 
-export SUDO=sudo
+echo "Bootstrapping dependencies..."
-if [ -f /etc/debian_version ] ; then
+letsencrypt-auto-source/letsencrypt-auto --os-packages-only
-  echo "Bootstrapping dependencies for Debian-based OSes..."
+if [ $? -ne 0 ] ; then
-  $SUDO bootstrap/_deb_common.sh
+    exit 1
-elif [ -f /etc/redhat-release ] ; then
-  echo "Bootstrapping dependencies for RedHat-based OSes..."
-  $SUDO bootstrap/_rpm_common.sh
-else
-  echo "Dont have bootstrapping for this OS!"
-  exit 1
 fi
 
-bootstrap/dev/venv.sh
+tools/venv.sh
 sudo venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \
                    --renew-by-default --redirect --register-unsafely-without-email \
                    --domain $PUBLIC_HOSTNAME --server $BOULDER_URL

tests/letstest/scripts/test_tox.sh

@@ -6,71 +6,15 @@ VENV_NAME="venv"
 LEA_PATH=./letsencrypt/
 VENV_PATH=${LEA_PATH/$VENV_NAME}
 VENV_BIN=${VENV_PATH}/bin
-BOOTSTRAP=${LEA_PATH}/bootstrap
 
-SUDO=sudo
-
-ExperimentalBootstrap() {
-  # Arguments: Platform name, boostrap script name, SUDO command (iff needed)
-    if [ "$2" != "" ]  ; then
-      echo "Bootstrapping dependencies for $1..."
-      if [ "$3" != "" ] ; then
-        "$3" "$BOOTSTRAP/$2"
-      else
-        "$BOOTSTRAP/$2"
-      fi
-    fi
-}
 
 # virtualenv call is not idempotent: it overwrites pip upgraded in
 # later steps, causing "ImportError: cannot import name unpack_url"
-if [ ! -f $BOOTSTRAP/debian.sh ] ; then
-  echo "Cannot find the letsencrypt bootstrap scripts in $BOOTSTRAP"
-  exit 1
-fi
 
-if [ -f /etc/debian_version ] ; then
+"$LEA_PATH/letsencrypt-auto" --os-packages-only
-  echo "Bootstrapping dependencies for Debian-based OSes..."
-  $SUDO $BOOTSTRAP/_deb_common.sh
-elif [ -f /etc/redhat-release ] ; then
-  echo "Bootstrapping dependencies for RedHat-based OSes..."
-  $SUDO $BOOTSTRAP/_rpm_common.sh
-elif `grep -q openSUSE /etc/os-release` ; then
-  echo "Bootstrapping dependencies for openSUSE-based OSes..."
-  $SUDO $BOOTSTRAP/_suse_common.sh
-elif [ -f /etc/arch-release ] ; then
-  if [ "$DEBUG" = 1 ] ; then
-    echo "Bootstrapping dependencies for Archlinux..."
-    $SUDO $BOOTSTRAP/archlinux.sh
-  else
-    echo "Please use pacman to install letsencrypt packages:"
-    echo "# pacman -S letsencrypt letsencrypt-apache"
-    echo
-    echo "If you would like to use the virtualenv way, please run the script again with the"
-    echo "--debug flag."
-    exit 1
-  fi
-elif [ -f /etc/manjaro-release ] ; then
-  ExperimentalBootstrap "Manjaro Linux" manjaro.sh "$SUDO"
-elif [ -f /etc/gentoo-release ] ; then
-  ExperimentalBootstrap "Gentoo" _gentoo_common.sh "$SUDO"
-elif uname | grep -iq FreeBSD ; then
-  ExperimentalBootstrap "FreeBSD" freebsd.sh "$SUDO"
-elif uname | grep -iq Darwin ; then
-  ExperimentalBootstrap "Mac OS X" mac.sh # homebrew doesn't normally run as root
-elif grep -iq "Amazon Linux" /etc/issue ; then
-  ExperimentalBootstrap "Amazon Linux" _rpm_common.sh "$SUDO"
-else
-  echo "Sorry, I don't know how to bootstrap Let's Encrypt on your operating system!"
-  echo
-  echo "You will need to bootstrap, configure virtualenv, and run a pip install manually"
-  echo "Please see https://letsencrypt.readthedocs.org/en/latest/contributing.html#prerequisites"
-  echo "for more info"
-fi
-echo "Bootstrapped!"
 
 cd letsencrypt
-./bootstrap/dev/venv.sh
+./tools/venv.sh
 PYVER=`python --version 2>&1 | cut -d" " -f 2 | cut -d. -f1,2 | sed 's/\.//'`
 
 if [ $PYVER -eq 26 ] ; then