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
adbe5e90
Commit
adbe5e90
authored
Apr 11, 2017
by
neil
Committed by
GitHub
Apr 11, 2017
Browse files
Merge pull request #785 from Neilpang/dev
support change account conf from env
parents
7b40cbe8
fcdf41ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
adbe5e90
#!/usr/bin/env sh
#!/usr/bin/env sh
VER
=
2.6.
8
VER
=
2.6.
9
PROJECT_NAME
=
"acme.sh"
PROJECT_NAME
=
"acme.sh"
...
@@ -1847,6 +1847,24 @@ _saveaccountconf() {
...
@@ -1847,6 +1847,24 @@ _saveaccountconf() {
_save_conf
"
$ACCOUNT_CONF_PATH
"
"
$1
"
"
$2
"
_save_conf
"
$ACCOUNT_CONF_PATH
"
"
$1
"
"
$2
"
}
}
#key value
_saveaccountconf_mutable
()
{
_save_conf
"
$ACCOUNT_CONF_PATH
"
"SAVED_
$1
"
"
$2
"
#remove later
_clearaccountconf
"
$1
"
}
#key
_readaccountconf
()
{
_read_conf
"
$ACCOUNT_CONF_PATH
"
"
$1
"
}
#key
_readaccountconf_mutable
()
{
_rac_key
=
"
$1
"
_readaccountconf
"SAVED_
$_rac_key
"
}
#_clearaccountconf key
#_clearaccountconf key
_clearaccountconf
()
{
_clearaccountconf
()
{
_clear_conf
"
$ACCOUNT_CONF_PATH
"
"
$1
"
_clear_conf
"
$ACCOUNT_CONF_PATH
"
"
$1
"
...
...
dnsapi/dns_cf.sh
View file @
adbe5e90
...
@@ -14,6 +14,8 @@ dns_cf_add() {
...
@@ -14,6 +14,8 @@ dns_cf_add() {
fulldomain
=
$1
fulldomain
=
$1
txtvalue
=
$2
txtvalue
=
$2
CF_Key
=
"
${
CF_Key
:-
$(
_readaccountconf_mutable CF_Key
)
}
"
CF_Email
=
"
${
CF_Email
:-
$(
_readaccountconf_mutable CF_Email
)
}
"
if
[
-z
"
$CF_Key
"
]
||
[
-z
"
$CF_Email
"
]
;
then
if
[
-z
"
$CF_Key
"
]
||
[
-z
"
$CF_Email
"
]
;
then
CF_Key
=
""
CF_Key
=
""
CF_Email
=
""
CF_Email
=
""
...
@@ -29,8 +31,8 @@ dns_cf_add() {
...
@@ -29,8 +31,8 @@ dns_cf_add() {
fi
fi
#save the api key and email to the account conf file.
#save the api key and email to the account conf file.
_saveaccountconf CF_Key
"
$CF_Key
"
_saveaccountconf
_mutable
CF_Key
"
$CF_Key
"
_saveaccountconf CF_Email
"
$CF_Email
"
_saveaccountconf
_mutable
CF_Email
"
$CF_Email
"
_debug
"First detect the root zone"
_debug
"First detect the root zone"
if
!
_get_root
"
$fulldomain
"
;
then
if
!
_get_root
"
$fulldomain
"
;
then
...
...
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