Merge pull request #2604 from cngarrison/master

Added trailing slash to end of each line of DEPLOY_SCRIPT_CMD
This commit is contained in:
neil 2019-12-19 21:35:37 +08:00 committed by GitHub
commit 5a3c3b4876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -85,19 +85,19 @@ routeros_deploy() {
scp "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key" scp "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key"
_info "Trying to push cert '$_cfullchain' to router" _info "Trying to push cert '$_cfullchain' to router"
scp "$_cfullchain" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.cer" scp "$_cfullchain" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.cer"
DEPLOY_SCRIPT_CMD="/system script add name=\"LE Cert Deploy - $_cdomain\" owner=admin policy=ftp,read,write,password,sensitive DEPLOY_SCRIPT_CMD="/system script add name=\"LE Cert Deploy - $_cdomain\" owner=admin policy=ftp,read,write,password,sensitive \
source=\"## generated by routeros deploy script in acme.sh source=\"## generated by routeros deploy script in acme.sh;\
\n/certificate remove [ find name=$_cdomain.cer_0 ] \n/certificate remove [ find name=$_cdomain.cer_0 ];\
\n/certificate remove [ find name=$_cdomain.cer_1 ] \n/certificate remove [ find name=$_cdomain.cer_1 ];\
\ndelay 1 \ndelay 1;\
\n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\" \n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\";\
\n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\" \n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\";\
\ndelay 1 \ndelay 1;\
\n/file remove $_cdomain.cer \n/file remove $_cdomain.cer;\
\n/file remove $_cdomain.key \n/file remove $_cdomain.key;\
\ndelay 2 \ndelay 2;\
\n/ip service set www-ssl certificate=$_cdomain.cer_0 \n/ip service set www-ssl certificate=$_cdomain.cer_0;\
\n$ROUTER_OS_ADDITIONAL_SERVICES \n$ROUTER_OS_ADDITIONAL_SERVICES;\
\n\" \n\"
" "
# shellcheck disable=SC2029 # shellcheck disable=SC2029