Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
aec66362
Commit
aec66362
authored
Jun 02, 2019
by
neilpang
Browse files
add _getdeployconf
parent
a18c3ff0
Changes
2
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
aec66362
...
@@ -2078,6 +2078,23 @@ _readdomainconf() {
...
@@ -2078,6 +2078,23 @@ _readdomainconf() {
_read_conf
"
$DOMAIN_CONF
"
"
$1
"
_read_conf
"
$DOMAIN_CONF
"
"
$1
"
}
}
#key value base64encode
_savedeployconf
()
{
_savedomainconf
"SAVED_
$1
"
"
$2
"
"
$3
"
#remove later
_clearaccountconf
"
$1
"
}
#key
_getdeployconf
()
{
_rac_key
=
"
$1
"
if
[
"
$(
eval echo
\$
"
$_rac_key
"
)
"
]
;
then
return
0
# do nothing
fi
_saved
=
$(
_readdomainconf
"SAVED_
$_rac_key
"
)
eval
"export
$_rac_key
=
$_saved
"
}
#_saveaccountconf key value base64encode
#_saveaccountconf key value base64encode
_saveaccountconf
()
{
_saveaccountconf
()
{
_save_conf
"
$ACCOUNT_CONF_PATH
"
"
$@
"
_save_conf
"
$ACCOUNT_CONF_PATH
"
"
$@
"
...
...
deploy/docker.sh
View file @
aec66362
...
@@ -19,13 +19,13 @@ docker_deploy() {
...
@@ -19,13 +19,13 @@ docker_deploy() {
_cca
=
"
$4
"
_cca
=
"
$4
"
_cfullchain
=
"
$5
"
_cfullchain
=
"
$5
"
_debug _cdomain
"
$_cdomain
"
_debug _cdomain
"
$_cdomain
"
DEPLOY_DOCKER_CONTAINER_LABEL
=
"
$(
echo
"
$
DEPLOY_DOCKER_CONTAINER_LABEL
"
|
tr
-d
'"'
)
"
_getdeployconf
DEPLOY_DOCKER_CONTAINER_LABEL
if
[
-z
"
$DEPLOY_DOCKER_CONTAINER_LABEL
"
]
;
then
if
[
-z
"
$DEPLOY_DOCKER_CONTAINER_LABEL
"
]
;
then
_err
"The DEPLOY_DOCKER_CONTAINER_LABEL variable is not defined, we use this label to find the container."
_err
"The DEPLOY_DOCKER_CONTAINER_LABEL variable is not defined, we use this label to find the container."
_err
"See:
$_DEPLOY_DOCKER_WIKI
"
_err
"See:
$_DEPLOY_DOCKER_WIKI
"
fi
fi
_saved
omain
conf DEPLOY_DOCKER_CONTAINER_LABEL
"
$DEPLOY_DOCKER_CONTAINER_LABEL
"
_saved
eploy
conf DEPLOY_DOCKER_CONTAINER_LABEL
"
$DEPLOY_DOCKER_CONTAINER_LABEL
"
if
[
"
$DOCKER_HOST
"
]
;
then
if
[
"
$DOCKER_HOST
"
]
;
then
_saveaccountconf DOCKER_HOST
"
$DOCKER_HOST
"
_saveaccountconf DOCKER_HOST
"
$DOCKER_HOST
"
...
@@ -63,29 +63,29 @@ docker_deploy() {
...
@@ -63,29 +63,29 @@ docker_deploy() {
fi
fi
fi
fi
DEPLOY_DOCKER_CONTAINER_KEY_FILE
=
"
$(
echo
"
$
DEPLOY_DOCKER_CONTAINER_KEY_FILE
"
|
tr
-d
'"'
)
"
_getdeployconf
DEPLOY_DOCKER_CONTAINER_KEY_FILE
if
[
"
$DEPLOY_DOCKER_CONTAINER_KEY_FILE
"
]
;
then
if
[
"
$DEPLOY_DOCKER_CONTAINER_KEY_FILE
"
]
;
then
_saved
omain
conf DEPLOY_DOCKER_CONTAINER_KEY_FILE
"
$DEPLOY_DOCKER_CONTAINER_KEY_FILE
"
_saved
eploy
conf DEPLOY_DOCKER_CONTAINER_KEY_FILE
"
$DEPLOY_DOCKER_CONTAINER_KEY_FILE
"
fi
fi
DEPLOY_DOCKER_CONTAINER_CERT_FILE
=
"
$(
echo
"
$
DEPLOY_DOCKER_CONTAINER_CERT_FILE
"
|
tr
-d
'"'
)
"
_getdeployconf
DEPLOY_DOCKER_CONTAINER_CERT_FILE
if
[
"
$DEPLOY_DOCKER_CONTAINER_CERT_FILE
"
]
;
then
if
[
"
$DEPLOY_DOCKER_CONTAINER_CERT_FILE
"
]
;
then
_saved
omain
conf DEPLOY_DOCKER_CONTAINER_CERT_FILE
"
$DEPLOY_DOCKER_CONTAINER_CERT_FILE
"
_saved
eploy
conf DEPLOY_DOCKER_CONTAINER_CERT_FILE
"
$DEPLOY_DOCKER_CONTAINER_CERT_FILE
"
fi
fi
DEPLOY_DOCKER_CONTAINER_CA_FILE
=
"
$(
echo
"
$
DEPLOY_DOCKER_CONTAINER_CA_FILE
"
|
tr
-d
'"'
)
"
_getdeployconf
DEPLOY_DOCKER_CONTAINER_CA_FILE
if
[
"
$DEPLOY_DOCKER_CONTAINER_CA_FILE
"
]
;
then
if
[
"
$DEPLOY_DOCKER_CONTAINER_CA_FILE
"
]
;
then
_saved
omain
conf DEPLOY_DOCKER_CONTAINER_CA_FILE
"
$DEPLOY_DOCKER_CONTAINER_CA_FILE
"
_saved
eploy
conf DEPLOY_DOCKER_CONTAINER_CA_FILE
"
$DEPLOY_DOCKER_CONTAINER_CA_FILE
"
fi
fi
DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
=
"
$(
echo
"
$
DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
"
|
tr
-d
'"'
)
"
_getdeployconf
DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
if
[
"
$DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
"
]
;
then
if
[
"
$DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
"
]
;
then
_saved
omain
conf DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
"
$DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
"
_saved
eploy
conf DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
"
$DEPLOY_DOCKER_CONTAINER_FULLCHAIN_FILE
"
fi
fi
DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
=
"
$(
echo
"
$
DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
"
|
tr
-d
'"'
)
"
_getdeployconf
DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
if
[
"
$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
"
]
;
then
if
[
"
$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
"
]
;
then
_saved
omain
conf DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
"
$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
"
_saved
eploy
conf DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
"
$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD
"
fi
fi
_cid
=
"
$(
_get_id
"
$DEPLOY_DOCKER_CONTAINER_LABEL
"
)
"
_cid
=
"
$(
_get_id
"
$DEPLOY_DOCKER_CONTAINER_LABEL
"
)
"
...
...
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