Merge pull request #169 from dedinext/master

Add and comment optional sshuserid for ssh ACL

getssl

@@ -153,10 +153,11 @@
 # 2016-11-07 style updates
 # 2016-11-07 bug fix DOMAIN_PEM_LOCATION starting with ./ #167
 # 2016-11-08 Fix for openssl 1.1.0  #166 (1.79)
+# 2016-11-08 Add and comment optional sshuserid for ssh ACL (1.80)
 # ----------------------------------------------------------------------------------------
 
 PROGNAME=${0##*/}
-VERSION="1.79"
+VERSION="1.80"
 
 # defaults
 CODE_LOCATION="https://raw.githubusercontent.com/srvrco/getssl/master/getssl"
@@ -1004,11 +1005,14 @@ write_domain_template() { # write out a template file for a domain.
 	# Acme Challenge Location. The first line for the domain, the following ones for each additional domain.
 	# If these start with ssh: then the next variable is assumed to be the hostname and the rest the location.
 	# An ssh key will be needed to provide you with access to the remote server.
+	# Optionally, you can specify a different userid for ssh/scp to use on the remote server before the @ sign.
+	# If left blank, the username on the local server will be used to authenticate against the remote server.
 	# If these start with ftp: then the next variables are ftpuserid:ftppassword:servername:ACL_location
 	# These should be of the form "/path/to/your/website/folder/.well-known/acme-challenge"
 	# where "/path/to/your/website/folder/" is the path, on your web server, to the web root for your domain.
 	#ACL=('/var/www/${DOMAIN}/web/.well-known/acme-challenge'
 	#     'ssh:server5:/var/www/${DOMAIN}/web/.well-known/acme-challenge'
+	#     'ssh:sshuserid@server5:/var/www/${DOMAIN}/web/.well-known/acme-challenge'
 	#     'ftp:ftpuserid:ftppassword:${DOMAIN}:/web/.well-known/acme-challenge')
 
 	#Enable use of a single ACL for all checks
@@ -1553,7 +1557,7 @@ alldomains=$(echo "$DOMAIN,$SANS" | sed "s/,/ /g")
 dn=0
 for d in $alldomains; do
   # $d is domain in current loop, which is number $dn for ACL
-  info "Verifing $d"
+  info "Verifying $d"
   if [[ "$USE_SINGLE_ACL" == "true" ]]; then
     DOMAIN_ACL="${ACL[0]}"
   else