mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-12-25 14:41:40 +00:00
Merge pull request #2292 from cngarrison/master
change to routeros native script rather than bash multiline commands
This commit is contained in:
commit
06f860c8ea
@ -85,30 +85,27 @@ routeros_deploy() {
|
||||
scp "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key"
|
||||
_info "Trying to push cert '$_cfullchain' to router"
|
||||
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
|
||||
source=\"## generated by routeros deploy script in acme.sh
|
||||
\n/certificate remove [ find name=$_cdomain.cer_0 ]
|
||||
\n/certificate remove [ find name=$_cdomain.cer_1 ]
|
||||
\ndelay 1
|
||||
\n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\"
|
||||
\n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\"
|
||||
\ndelay 1
|
||||
\n/file remove $_cdomain.cer
|
||||
\n/file remove $_cdomain.key
|
||||
\ndelay 2
|
||||
\n/ip service set www-ssl certificate=$_cdomain.cer_0
|
||||
\n$ROUTER_OS_ADDITIONAL_SERVICES
|
||||
\n\"
|
||||
"
|
||||
# shellcheck disable=SC2029
|
||||
ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" bash -c "'
|
||||
ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "$DEPLOY_SCRIPT_CMD"
|
||||
# shellcheck disable=SC2029
|
||||
ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script run \"LE Cert Deploy - $_cdomain\""
|
||||
# shellcheck disable=SC2029
|
||||
ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script remove \"LE Cert Deploy - $_cdomain\""
|
||||
|
||||
/certificate remove $_cdomain.cer_0
|
||||
|
||||
/certificate remove $_cdomain.cer_1
|
||||
|
||||
delay 1
|
||||
|
||||
/certificate import file-name=$_cdomain.cer passphrase=\"\"
|
||||
|
||||
/certificate import file-name=$_cdomain.key passphrase=\"\"
|
||||
|
||||
delay 1
|
||||
|
||||
/file remove $_cdomain.cer
|
||||
|
||||
/file remove $_cdomain.key
|
||||
|
||||
delay 2
|
||||
|
||||
/ip service set www-ssl certificate=$_cdomain.cer_0
|
||||
$ROUTER_OS_ADDITIONAL_SERVICES
|
||||
|
||||
'"
|
||||
return 0
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user