From de1e84ed932099dfe5a5330e26d56915ed830975 Mon Sep 17 00:00:00 2001
From: Brad Warren <bradmw@umich.edu>
Date: Fri, 14 Aug 2015 17:04:42 -0700
Subject: [PATCH 1/2] Dynamically choose python binary

---
 letsencrypt/plugins/manual.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/letsencrypt/plugins/manual.py b/letsencrypt/plugins/manual.py
index 53db6a200..d13f35f99 100644
--- a/letsencrypt/plugins/manual.py
+++ b/letsencrypt/plugins/manual.py
@@ -57,7 +57,8 @@ mkdir -p {root}/public_html/{response.URI_ROOT_PATH}
 cd {root}/public_html
 echo -n {validation} > {response.URI_ROOT_PATH}/{encoded_token}
 # run only once per server:
-python -c "import BaseHTTPServer, SimpleHTTPServer; \\
+$(command -v python2 || command -v python2.7 || command -v python2.6) -c \\
+"import BaseHTTPServer, SimpleHTTPServer; \\
 SimpleHTTPServer.SimpleHTTPRequestHandler.extensions_map = {{'': '{ct}'}}; \\
 s = BaseHTTPServer.HTTPServer(('', {port}), SimpleHTTPServer.SimpleHTTPRequestHandler); \\
 s.serve_forever()" """
@@ -70,7 +71,8 @@ cd {root}/public_html
 echo -n {validation} > {response.URI_ROOT_PATH}/{encoded_token}
 # run only once per server:
 openssl req -new -newkey rsa:4096 -subj "/" -days 1 -nodes -x509 -keyout ../key.pem -out ../cert.pem
-python -c "import BaseHTTPServer, SimpleHTTPServer, ssl; \\
+$(command -v python2 || command -v python2.7 || command -v python2.6) -c \\
+"import BaseHTTPServer, SimpleHTTPServer, ssl; \\
 SimpleHTTPServer.SimpleHTTPRequestHandler.extensions_map = {{'': '{ct}'}}; \\
 s = BaseHTTPServer.HTTPServer(('', {port}), SimpleHTTPServer.SimpleHTTPRequestHandler); \\
 s.socket = ssl.wrap_socket(s.socket, keyfile='../key.pem', certfile='../cert.pem'); \\

From a78a1e70b09976d6eded73250abedd335f53b55c Mon Sep 17 00:00:00 2001
From: Brad Warren <bradmw@umich.edu>
Date: Fri, 14 Aug 2015 17:31:31 -0700
Subject: [PATCH 2/2] Y u fail?