X-Git-Url: https://iankelling.org/git/?p=basic-https-conf;a=blobdiff_plain;f=apache-site;h=8a67722ada42f9487a7fa6408a0a9d29d7612784;hp=aaefd9ee7beafc5fc7815597b647f36560a8bb1d;hb=74fad776536c29ecc45395259ea19fd3b1cf5cac;hpb=b1314beccfa3fb9f70e82edd153395de00939dfd

diff --git a/apache-site b/apache-site
index aaefd9e..8a67722 100755
--- a/apache-site
+++ b/apache-site
@@ -28,11 +28,12 @@ location for storing certs.
 
 EXTRA_SETTINGS_FILE can be - for stdin
 -p PORT
--i          Insecure, no ssl
--c CERT_DIR Default is /p/c/machine_specific/\$HOSTNAME/webservercerts
--h|--help   Print help and exit
--r          DocumentRoot
---          Subsequent arguments are never treated as options
+-i                 Insecure, no ssl
+-c CERT_DIR       In priority: this arg, $ACME_TINY_WRAPPER_CERT_DIR,
+                  $HOME/webservercerts, if the other options aren't set.
+-h|--help         Print help and exit
+-r                DocumentRoot
+--                Subsequent arguments are never treated as options
 
 Note: options and non-options can be in any order.
 EOF
@@ -41,7 +42,10 @@ EOF
 
 ##### begin command line parsing ########
 
-cert_dir=/p/c/machine_specific/$HOSTNAME/webservercerts
+cert_dir="$ACME_TINY_WRAPPER_CERT_DIR"
+if [[ ! $cert_dir ]]; then
+    cert_dir=$HOME/webservercerts
+fi
 ssl=true
 extra_settings=
 args=()