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
1ccfa96c
Commit
1ccfa96c
authored
Dec 28, 2022
by
PMExtra
Browse files
improve logging
parent
ed63eb68
Changes
2
Show whitespace changes
Inline
Side-by-side
deploy/vault.sh
View file @
1ccfa96c
...
@@ -79,9 +79,9 @@ vault_deploy() {
...
@@ -79,9 +79,9 @@ vault_deploy() {
if
[
-n
"
$VAULT_RENEW_TOKEN
"
]
;
then
if
[
-n
"
$VAULT_RENEW_TOKEN
"
]
;
then
URL
=
"
$VAULT_ADDR
/v1/auth/token/renew-self"
URL
=
"
$VAULT_ADDR
/v1/auth/token/renew-self"
_info
"Renew the token to default TTL"
_info
"Renew the
Vault
token to default TTL"
if
!
_post
""
"
$URL
"
>
/dev/null
;
then
if
!
_post
""
"
$URL
"
>
/dev/null
;
then
_err
"Failed to renew the token"
_err
"Failed to renew the
Vault
token"
return
1
return
1
fi
fi
fi
fi
...
...
deploy/vault_cli.sh
View file @
1ccfa96c
...
@@ -73,30 +73,30 @@ vault_cli_deploy() {
...
@@ -73,30 +73,30 @@ vault_cli_deploy() {
fi
fi
if
[
-n
"
$VAULT_RENEW_TOKEN
"
]
;
then
if
[
-n
"
$VAULT_RENEW_TOKEN
"
]
;
then
_info
"Renew the token to default TTL"
_info
"Renew the
Vault
token to default TTL"
if
!
$VAULT_CMD
token renew
;
then
if
!
$VAULT_CMD
token renew
;
then
_err
"Failed to renew the token"
_err
"Failed to renew the
Vault
token"
return
1
return
1
fi
fi
fi
fi
if
[
-n
"
$VAULT_FABIO_MODE
"
]
;
then
if
[
-n
"
$VAULT_FABIO_MODE
"
]
;
then
_info
"Writing certificate and key to
$
URL
in Fabio mode"
_info
"Writing certificate and key to
$
{
VAULT_PREFIX
}
/
${
_cdomain
}
in Fabio mode"
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
"
cert
=
@
"
$_cfullchain
"
key
=
@
"
$_ckey
"
||
return
1
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
"
cert
=
@
"
$_cfullchain
"
key
=
@
"
$_ckey
"
||
return
1
else
else
_info
"Writing certificate to
$
URL
/cert.pem"
_info
"Writing certificate to
$
{
VAULT_PREFIX
}
/
${
_cdomain
}
/cert.pem"
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/cert.pem"
value
=
@
"
$_ccert
"
||
return
1
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/cert.pem"
value
=
@
"
$_ccert
"
||
return
1
_info
"Writing key to
$
URL
/cert.key"
_info
"Writing key to
$
{
VAULT_PREFIX
}
/
${
_cdomain
}
/cert.key"
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/cert.key"
value
=
@
"
$_ckey
"
||
return
1
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/cert.key"
value
=
@
"
$_ckey
"
||
return
1
_info
"Writing CA certificate to
$
URL
/ca.pem"
_info
"Writing CA certificate to
$
{
VAULT_PREFIX
}
/
${
_cdomain
}
/ca.pem"
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/ca.pem"
value
=
@
"
$_cca
"
||
return
1
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/ca.pem"
value
=
@
"
$_cca
"
||
return
1
_info
"Writing full-chain certificate to
$
URL
/fullchain.pem"
_info
"Writing full-chain certificate to
$
{
VAULT_PREFIX
}
/
${
_cdomain
}
/fullchain.pem"
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/fullchain.pem"
value
=
@
"
$_cfullchain
"
||
return
1
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/fullchain.pem"
value
=
@
"
$_cfullchain
"
||
return
1
# To make it compatible with the wrong ca path `chain.pem` which was used in former versions
# To make it compatible with the wrong ca path `chain.pem` which was used in former versions
if
$VAULT_CMD
kv get
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/chain.pem"
>
/dev/null
;
then
if
$VAULT_CMD
kv get
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/chain.pem"
>
/dev/null
;
then
_err
"The CA certificate has moved from chain.pem to ca.pem, if you don't depend on chain.pem anymore, you can delete it to avoid this warning"
_err
"The CA certificate has moved from chain.pem to ca.pem, if you don't depend on chain.pem anymore, you can delete it to avoid this warning"
_info
"Updating CA certificate to
$
URL
/chain.pem for backward compatibility"
_info
"Updating CA certificate to
$
{
VAULT_PREFIX
}
/
${
_cdomain
}
/chain.pem for backward compatibility"
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/chain.pem"
value
=
@
"
$_cca
"
||
return
1
$VAULT_CMD
kv put
"
${
VAULT_PREFIX
}
/
${
_cdomain
}
/chain.pem"
value
=
@
"
$_cca
"
||
return
1
fi
fi
fi
fi
...
...
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