Make the new letsencrypt-auto script the main one.

Remove the old bootstrap scripts, which have been subsumed into letsencrypt-auto-source/pieces/bootstrappers. They no longer need to be dispatched among manually: everyone can just run letsencrypt-auto --os-packages-only, regardless of OS. Make the root-level le-auto a symlink to the canonical version. It should thus still work for people running le-auto from a git checkout.
manell · Feb 5, 2016 · 192c3fa · 192c3fa
1 parent 70ab182
commit 192c3fa
Show file tree

Hide file tree

Showing 25 changed files with 14 additions and 627 deletions.
diff --git a/.travis.yml b/.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

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

diff --git a/Dockerfile-dev b/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
-RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \
+COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto
+RUN /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-only && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \
            /tmp/* \

diff --git a/bootstrap/README b/bootstrap/README
diff --git a/bootstrap/_arch_common.sh b/bootstrap/_arch_common.sh
diff --git a/bootstrap/_deb_common.sh b/bootstrap/_deb_common.sh
diff --git a/bootstrap/_gentoo_common.sh b/bootstrap/_gentoo_common.sh
diff --git a/bootstrap/_rpm_common.sh b/bootstrap/_rpm_common.sh
diff --git a/bootstrap/_suse_common.sh b/bootstrap/_suse_common.sh
diff --git a/bootstrap/archlinux.sh b/bootstrap/archlinux.sh
diff --git a/bootstrap/centos.sh b/bootstrap/centos.sh
diff --git a/bootstrap/debian.sh b/bootstrap/debian.sh
diff --git a/bootstrap/fedora.sh b/bootstrap/fedora.sh
diff --git a/bootstrap/freebsd.sh b/bootstrap/freebsd.sh
diff --git a/bootstrap/gentoo.sh b/bootstrap/gentoo.sh
diff --git a/bootstrap/install-deps.sh b/bootstrap/install-deps.sh
diff --git a/bootstrap/mac.sh b/bootstrap/mac.sh
diff --git a/bootstrap/manjaro.sh b/bootstrap/manjaro.sh
diff --git a/bootstrap/suse.sh b/bootstrap/suse.sh
diff --git a/bootstrap/ubuntu.sh b/bootstrap/ubuntu.sh
diff --git a/bootstrap/venv.sh b/bootstrap/venv.sh