iankelling.org
/
git
/
basic-https-conf
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b1314be
)
make default certdir matchup with acme-tiny-wrapper
author
Ian Kelling
<ian@iankelling.org>
Sat, 27 Aug 2016 13:10:06 +0000
(06:10 -0700)
committer
Ian Kelling
<ian@iankelling.org>
Sat, 27 Aug 2016 13:10:06 +0000
(06:10 -0700)
apache-site
patch
|
blob
|
history
diff --git
a/apache-site
b/apache-site
index aaefd9ee7beafc5fc7815597b647f36560a8bb1d..8a67722ada42f9487a7fa6408a0a9d29d7612784 100755
(executable)
--- a/
apache-site
+++ b/
apache-site
@@
-28,11
+28,12
@@
location for storing certs.
EXTRA_SETTINGS_FILE can be - for stdin
-p PORT
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
Note: options and non-options can be in any order.
EOF
@@
-41,7
+42,10
@@
EOF
##### begin command line parsing ########
##### 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=()
ssl=true
extra_settings=
args=()