summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Roesler <diafygi@gmail.com>2015-12-22 09:14:10 -0800
committerDaniel Roesler <diafygi@gmail.com>2015-12-22 09:14:10 -0800
commite5d24f7df884a6effa7bcf8ef8fe36b123f2f36d (patch)
treeb2d25cd17b22744186abe39e6a30c4a3ef984f61
parentb08e3789c02ca3b4e50452df151f014241e815de (diff)
parentc609a1c810c538f7826aa16fbf343ed19e193cb5 (diff)
Merge pull request #47 from nylen/patch-1
Provide a note about using an existing webserver
-rw-r--r--README.md2
-rw-r--r--sign_csr.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/README.md b/README.md
index 3c4f96d..abed9b5 100644
--- a/README.md
+++ b/README.md
@@ -79,6 +79,8 @@ openssl req -new -sha256 -key domain.key -subj "/" -reqexts SAN -config <(cat /e
Third, you run the script using python and passing in the path to your user
account public key and the domain CSR. The paths can be relative or absolute.
+By default the script will ask you to start a webserver on port 80. If you
+already have one, use the `--file-based` option instead.
```sh
python sign_csr.py --public-key user.pub domain.csr > signed.crt
diff --git a/sign_csr.py b/sign_csr.py
index 3c80a95..ab20a40 100644
--- a/sign_csr.py
+++ b/sign_csr.py
@@ -396,7 +396,12 @@ sudo python -c "import BaseHTTPServer; \\
# Step 15: Convert the signed cert from DER to PEM
sys.stderr.write("Certificate signed!\n")
- sys.stderr.write("You can stop running the python command on your server (Ctrl+C works).\n")
+
+ if file_based:
+ sys.stderr.write("You can remove the acme-challenge file from your webserver now.\n")
+ else:
+ sys.stderr.write("You can stop running the python command on your server (Ctrl+C works).\n")
+
signed_der64 = base64.b64encode(signed_der)
signed_pem = """\
-----BEGIN CERTIFICATE-----