From 74fad776536c29ecc45395259ea19fd3b1cf5cac Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sat, 27 Aug 2016 06:10:06 -0700
Subject: [PATCH] make default certdir matchup with acme-tiny-wrapper

---
 apache-site | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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=()
-- 
2.30.2