Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
ac0cdcf7
Unverified
Commit
ac0cdcf7
authored
Aug 02, 2018
by
neil
Committed by
GitHub
Aug 02, 2018
Browse files
Merge pull request #1760 from lf-zbw/dev
Fix key leakage in SSH deploy log.
parents
d19bc328
63134faf
Changes
1
Hide whitespace changes
Inline
Side-by-side
deploy/ssh.sh
View file @
ac0cdcf7
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# Only a username is required. All others are optional.
# Only a username is required. All others are optional.
#
#
# The following examples are for QNAP NAS running QTS 4.2
# The following examples are for QNAP NAS running QTS 4.2
# export DEPLOY_SSH_CMD="" # defaults to ssh
# export DEPLOY_SSH_CMD="" # defaults to ssh
# export DEPLOY_SSH_USER="admin" # required
# export DEPLOY_SSH_USER="admin" # required
# export DEPLOY_SSH_SERVER="qnap" # defaults to domain name
# export DEPLOY_SSH_SERVER="qnap" # defaults to domain name
...
@@ -101,7 +101,7 @@ ssh_deploy() {
...
@@ -101,7 +101,7 @@ ssh_deploy() {
fi
fi
# CERTFILE is optional.
# CERTFILE is optional.
# If provided then
private key
will be copied or appended to provided filename.
# If provided then
certificate
will be copied or appended to provided filename.
if
[
-n
"
$DEPLOY_SSH_CERTFILE
"
]
;
then
if
[
-n
"
$DEPLOY_SSH_CERTFILE
"
]
;
then
Le_Deploy_ssh_certfile
=
"
$DEPLOY_SSH_CERTFILE
"
Le_Deploy_ssh_certfile
=
"
$DEPLOY_SSH_CERTFILE
"
_savedomainconf Le_Deploy_ssh_certfile
"
$Le_Deploy_ssh_certfile
"
_savedomainconf Le_Deploy_ssh_certfile
"
$Le_Deploy_ssh_certfile
"
...
@@ -190,7 +190,7 @@ then rm -rf \"\$fn\"; echo \"Backup \$fn deleted as older than 180 days\"; fi; d
...
@@ -190,7 +190,7 @@ then rm -rf \"\$fn\"; echo \"Backup \$fn deleted as older than 180 days\"; fi; d
_info
"Backup directories erased after 180 days."
_info
"Backup directories erased after 180 days."
fi
fi
_debug
"Remote commands to execute:
$_cmdstr
"
_secure
_debug
"Remote commands to execute:
"
"
$_cmdstr
"
_info
"Submitting sequence of commands to remote server by ssh"
_info
"Submitting sequence of commands to remote server by ssh"
# quotations in bash cmd below intended. Squash travis spellcheck error
# quotations in bash cmd below intended. Squash travis spellcheck error
# shellcheck disable=SC2029
# shellcheck disable=SC2029
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment