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
9bc45563
Unverified
Commit
9bc45563
authored
Jun 14, 2019
by
neil
Committed by
GitHub
Jun 14, 2019
Browse files
Merge pull request #2338 from Neilpang/dev
Dev
parents
685755fe
882ac74a
Changes
2
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
9bc45563
...
@@ -3863,7 +3863,7 @@ issue() {
...
@@ -3863,7 +3863,7 @@ issue() {
_savedomainconf "Le_Keylength" "$_key_length"
_savedomainconf "Le_Keylength" "$_key_length"
vlist="$Le_Vlist"
vlist="$Le_Vlist"
_cleardomainconf "Le_Vlist"
_info "Getting domain auth token for each domain"
_info "Getting domain auth token for each domain"
sep='#'
sep='#'
dvsep=','
dvsep=','
...
@@ -4512,8 +4512,6 @@ $_authorizations_map"
...
@@ -4512,8 +4512,6 @@ $_authorizations_map"
fi
fi
fi
fi
_cleardomainconf "Le_Vlist"
if [ "$ACME_VERSION" = "2" ]; then
if [ "$ACME_VERSION" = "2" ]; then
_debug "v2 chain."
_debug "v2 chain."
else
else
...
@@ -6108,7 +6106,7 @@ Parameters:
...
@@ -6108,7 +6106,7 @@ Parameters:
--notify-level 0|1|2|3 Set the notification level: Default value is $NOTIFY_LEVEL_DEFAULT.
--notify-level 0|1|2|3 Set the notification level: Default value is $NOTIFY_LEVEL_DEFAULT.
0: disabled, no notification will be sent.
0: disabled, no notification will be sent.
1: send notification only when there is an error.
No news is good news.
1: send notification only when there is an error.
2: send notification when a cert is successfully renewed, or there is an error
2: send notification when a cert is successfully renewed, or there is an error
3: send notification when a cert is skipped, renewdd, or error
3: send notification when a cert is skipped, renewdd, or error
--notify-mode 0|1 Set notification mode. Default value is $NOTIFY_MODE_DEFAULT.
--notify-mode 0|1 Set notification mode. Default value is $NOTIFY_MODE_DEFAULT.
...
...
dnsapi/dns_maradns.sh
0 → 100755
View file @
9bc45563
#!/usr/bin/env sh
#Usage: dns_maradns_add _acme-challenge.www.domain.com "token"
dns_maradns_add
()
{
fulldomain
=
"
$1
"
txtvalue
=
"
$2
"
MARA_ZONE_FILE
=
"
${
MARA_ZONE_FILE
:-
$(
_readaccountconf_mutable MARA_ZONE_FILE
)
}
"
MARA_DUENDE_PID_PATH
=
"
${
MARA_DUENDE_PID_PATH
:-
$(
_readaccountconf_mutable MARA_DUENDE_PID_PATH
)
}
"
_check_zone_file
"
$MARA_ZONE_FILE
"
||
return
1
_check_duende_pid_path
"
$MARA_DUENDE_PID_PATH
"
||
return
1
_saveaccountconf_mutable MARA_ZONE_FILE
"
$MARA_ZONE_FILE
"
_saveaccountconf_mutable MARA_DUENDE_PID_PATH
"
$MARA_DUENDE_PID_PATH
"
printf
"%s. TXT '%s' ~
\n
"
"
$fulldomain
"
"
$txtvalue
"
>>
"
$MARA_ZONE_FILE
"
_reload_maradns
"
$MARA_DUENDE_PID_PATH
"
||
return
1
}
#Usage: dns_maradns_rm _acme-challenge.www.domain.com "token"
dns_maradns_rm
()
{
fulldomain
=
"
$1
"
txtvalue
=
"
$2
"
MARA_ZONE_FILE
=
"
${
MARA_ZONE_FILE
:-
$(
_readaccountconf_mutable MARA_ZONE_FILE
)
}
"
MARA_DUENDE_PID_PATH
=
"
${
MARA_DUENDE_PID_PATH
:-
$(
_readaccountconf_mutable MARA_DUENDE_PID_PATH
)
}
"
_check_zone_file
"
$MARA_ZONE_FILE
"
||
return
1
_check_duende_pid_path
"
$MARA_DUENDE_PID_PATH
"
||
return
1
_saveaccountconf_mutable MARA_ZONE_FILE
"
$MARA_ZONE_FILE
"
_saveaccountconf_mutable MARA_DUENDE_PID_PATH
"
$MARA_DUENDE_PID_PATH
"
_sed_i
"/^
$fulldomain
.
\+
TXT '
$txtvalue
' ~/d"
"
$MARA_ZONE_FILE
"
_reload_maradns
"
$MARA_DUENDE_PID_PATH
"
||
return
1
}
_check_zone_file
()
{
zonefile
=
"
$1
"
if
[
-z
"
$zonefile
"
]
;
then
_err
"MARA_ZONE_FILE not passed!"
return
1
elif
[
!
-w
"
$zonefile
"
]
;
then
_err
"MARA_ZONE_FILE not writable:
$zonefile
"
return
1
fi
}
_check_duende_pid_path
()
{
pidpath
=
"
$1
"
if
[
-z
"
$pidpath
"
]
;
then
_err
"MARA_DUENDE_PID_PATH not passed!"
return
1
fi
if
[
!
-r
"
$pidpath
"
]
;
then
_err
"MARA_DUENDE_PID_PATH not readable:
$pidpath
"
return
1
fi
}
_reload_maradns
()
{
pidpath
=
"
$1
"
kill
-s
HUP
--
"
$(
cat
"
$pidpath
"
)
"
if
[
$?
-ne
0
]
;
then
_err
"Unable to reload MaraDNS, kill returned
$?
"
return
1
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