diff --git a/README.md b/README.md index 5c8de55..157971b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,6 @@ vim /opt/letsencrypt-routeros/letsencrypt-routeros.settings | DOMAIN | mydomain.com | Use main domain for wildcard certificate or subdomain for subdomain certificate | | SETUP_SERVICES | (SSTP WWW API) | Array of services for which certificate will be installed | | SSH_STRICT_KEY_CHECKING | yes | Allows to override SSH option StrictHostKeyChecking | -| SSH_ACCEPTED_ALGORITHMS | ssh-rsa,ssh-dsa | Allows to override SSH option PubkeyAcceptedAlgorithms | Change permissions: diff --git a/letsencrypt-routeros.settings b/letsencrypt-routeros.settings index d92b889..429b95d 100644 --- a/letsencrypt-routeros.settings +++ b/letsencrypt-routeros.settings @@ -12,5 +12,3 @@ DOMAIN=vpnserver.yourdomain.com #SETUP_SERVICES=(WWW API) ## Uncomment this to disable StrictHostKeyChecking (default yes) #SSH_STRICT_KEY_CHECKING=no -## Uncomment this to specify PubkeyAcceptedAlgorithms (default ssh-rsa,ssh-dsa) -#SSH_ACCEPTED_ALGORITHMS=ssh-dsa diff --git a/letsencrypt-routeros.sh b/letsencrypt-routeros.sh index 2f22e81..7fcdc79 100755 --- a/letsencrypt-routeros.sh +++ b/letsencrypt-routeros.sh @@ -47,10 +47,10 @@ echo " Using certificate ${CERTIFICATE}" echo " User private key ${KEY}" #Create alias for RouterOS command -routeros="ssh -o PubkeyAcceptedAlgorithms=${SSH_ACCEPTED_ALGORITHMS:-ssh-dss,ssh-rsa} -o StrictHostKeyChecking=${SSH_STRICT_KEY_CHECKING:-yes} -i ${ROUTEROS_PRIVATE_KEY} ${ROUTEROS_USER}@${ROUTEROS_HOST} -p ${ROUTEROS_SSH_PORT}" +routeros="ssh -o PubkeyAcceptedKeyTypes=+ssh-dss -o StrictHostKeyChecking=${SSH_STRICT_KEY_CHECKING:-yes} -i ${ROUTEROS_PRIVATE_KEY} ${ROUTEROS_USER}@${ROUTEROS_HOST} -p ${ROUTEROS_SSH_PORT}" #Create alias for scp command -scp="scp -q -o PubkeyAcceptedAlgorithms=${SSH_ACCEPTED_ALGORITHMS:-ssh-dss,ssh-rsa} -o StrictHostKeyChecking=${SSH_STRICT_KEY_CHECKING:-yes} -P ${ROUTEROS_SSH_PORT} -i ${ROUTEROS_PRIVATE_KEY}" +scp="scp -q -o PubkeyAcceptedKeyTypes=+ssh-dss -o StrictHostKeyChecking=${SSH_STRICT_KEY_CHECKING:-yes} -P ${ROUTEROS_SSH_PORT} -i ${ROUTEROS_PRIVATE_KEY}" echo "" echo "Checking connection to RouterOS"