starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 00:22:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into continuity-error

Browse Source
This commit is contained in:
Brad Warren
2016-02-26 15:44:28 -08:00
parent 7e6002a13f 0c345cb8d3
commit b15890ceb7
3 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-auto-source/Dockerfile
+1 -1
View File
@@ -17,7 +17,7 @@ RUN apt-get update && \
apt-get clean apt-get clean
RUN pip install nose RUN pip install nose
RUN mkdir -p /home/lea/letsencrypt/letsencrypt RUN mkdir -p /home/lea/letsencrypt
# Install fake testing CA: # Install fake testing CA:
COPY ./tests/certs/ca/my-root-ca.crt.pem /usr/local/share/ca-certificates/ COPY ./tests/certs/ca/my-root-ca.crt.pem /usr/local/share/ca-certificates/
letsencrypt-auto-source/letsencrypt-auto
+7 -3
View File
@@ -423,9 +423,10 @@ TempDir() {
if [ "$NO_SELF_UPGRADE" = 1 ]; then if [ "$1" = "--le-auto-phase2" ]; then
# Phase 2: Create venv, install LE, and run. # Phase 2: Create venv, install LE, and run.
shift 1 # the --le-auto-phase2 arg
if [ -f "$VENV_BIN/letsencrypt" ]; then if [ -f "$VENV_BIN/letsencrypt" ]; then
INSTALLED_VERSION=$("$VENV_BIN/letsencrypt" --version 2>&1 | cut -d " " -f 2) INSTALLED_VERSION=$("$VENV_BIN/letsencrypt" --version 2>&1 | cut -d " " -f 2)
else else
@@ -1671,6 +1672,7 @@ else
exit 0 exit 0
fi fi
if [ "$NO_SELF_UPGRADE" != 1 ]; then
echo "Checking for new version..." echo "Checking for new version..."
TEMP_DIR=$(TempDir) TEMP_DIR=$(TempDir)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -1831,6 +1833,8 @@ UNLIKELY_EOF
$SUDO mv -f "$TEMP_DIR/letsencrypt-auto.permission-clone" "$0" $SUDO mv -f "$TEMP_DIR/letsencrypt-auto.permission-clone" "$0"
# TODO: Clean up temp dir safely, even if it has quotes in its path. # TODO: Clean up temp dir safely, even if it has quotes in its path.
rm -rf "$TEMP_DIR" rm -rf "$TEMP_DIR"
fi # should upgrade fi # A newer version is available.
"$0" --no-self-upgrade "$@" fi # Self-upgrading is allowed.
"$0" --le-auto-phase2 "$@"
fi fi
letsencrypt-auto-source/letsencrypt-auto.template
+7 -3
View File
@@ -171,9 +171,10 @@ TempDir() {
if [ "$NO_SELF_UPGRADE" = 1 ]; then if [ "$1" = "--le-auto-phase2" ]; then
# Phase 2: Create venv, install LE, and run. # Phase 2: Create venv, install LE, and run.
shift 1 # the --le-auto-phase2 arg
if [ -f "$VENV_BIN/letsencrypt" ]; then if [ -f "$VENV_BIN/letsencrypt" ]; then
INSTALLED_VERSION=$("$VENV_BIN/letsencrypt" --version 2>&1 | cut -d " " -f 2) INSTALLED_VERSION=$("$VENV_BIN/letsencrypt" --version 2>&1 | cut -d " " -f 2)
else else
@@ -235,6 +236,7 @@ else
exit 0 exit 0
fi fi
if [ "$NO_SELF_UPGRADE" != 1 ]; then
echo "Checking for new version..." echo "Checking for new version..."
TEMP_DIR=$(TempDir) TEMP_DIR=$(TempDir)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -269,6 +271,8 @@ UNLIKELY_EOF
$SUDO mv -f "$TEMP_DIR/letsencrypt-auto.permission-clone" "$0" $SUDO mv -f "$TEMP_DIR/letsencrypt-auto.permission-clone" "$0"
# TODO: Clean up temp dir safely, even if it has quotes in its path. # TODO: Clean up temp dir safely, even if it has quotes in its path.
rm -rf "$TEMP_DIR" rm -rf "$TEMP_DIR"
fi # should upgrade fi # A newer version is available.
"$0" --no-self-upgrade "$@" fi # Self-upgrading is allowed.
"$0" --le-auto-phase2 "$@"
fi fi