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
9964e6eb
"deps/jemalloc/src/prof.c" did not exist on "4a884343f5935f7d470ab0ce013a421f119cfb3a"
Commit
9964e6eb
authored
Apr 17, 2017
by
David Kerr
Browse files
Merge remote-tracking branch 'upstream/master' into ssh-deploy
parents
fd159801
8bcc19d9
Changes
5
Show whitespace changes
Inline
Side-by-side
Dockerfile
View file @
9964e6eb
...
...
@@ -48,5 +48,12 @@ RUN for verb in help \
printf -- "%b" "#!/usr/bin/env sh\n/root/.acme.sh/acme.sh --${verb} --config-home /acme.sh \"\$@\"" >/usr/local/bin/--${verb} && chmod +x /usr/local/bin/--${verb} \
; done
ENTRYPOINT
["/root/.acme.sh/acme.sh", "--config-home", "/acme.sh"]
RUN
printf
"%b"
'#!'
"/usr/bin/env sh
\n
\
if [
\"\$
1
\"
=
\"
daemon
\"
]; then
\n
\
crond; tail -f /dev/null;
\n
\
else
\n
\
/root/.acme.sh/acme.sh --config-home /acme.sh
\"\$
@
\"\n
\
fi"
>
/entry.sh
&&
chmod
+x /entry.sh
ENTRYPOINT
["/entry.sh"]
CMD
["--help"]
acme.sh
View file @
9964e6eb
#!/usr/bin/env sh
VER
=
2.6.
8
VER
=
2.6.
9
PROJECT_NAME
=
"acme.sh"
...
...
@@ -1105,10 +1105,10 @@ _readKeyLengthFromCSR() {
_debug2 _outcsr
"
$_outcsr
"
if
_contains
"
$_outcsr
"
"Public Key Algorithm: id-ecPublicKey"
;
then
_debug
"ECC CSR"
echo
"
$_outcsr
"
| _egrep_o
"^ *ASN1 OID:.*"
|
cut
-d
':'
-f
2 |
tr
-d
' '
echo
"
$_outcsr
"
|
tr
"
\t
"
" "
|
_egrep_o
"^ *ASN1 OID:.*"
|
cut
-d
':'
-f
2 |
tr
-d
' '
else
_debug
"RSA CSR"
echo
"
$_outcsr
"
| _egrep_o
"(^ *|
^
RSA )Public.Key:.*"
|
cut
-d
'('
-f
2 |
cut
-d
' '
-f
1
echo
"
$_outcsr
"
|
tr
"
\t
"
" "
|
_egrep_o
"(^ *|RSA )Public.Key:.*"
|
cut
-d
'('
-f
2 |
cut
-d
' '
-f
1
fi
}
...
...
@@ -1847,6 +1847,24 @@ _saveaccountconf() {
_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
()
{
_clear_conf
"
$ACCOUNT_CONF_PATH
"
"
$1
"
...
...
@@ -2565,7 +2583,7 @@ _checkConf() {
if
[
!
-f
"
$2
"
]
&&
!
echo
"
$2
"
|
grep
'*$'
>
/dev/null
&&
echo
"
$2
"
|
grep
'*'
>
/dev/null
;
then
_debug
"wildcard"
for
_w_f
in
$2
;
do
if
[
-f
"
$_w_f
"
]
&&
_checkConf
"
$1
"
"
$_w_f
"
;
then
if
[
-f
"
$_w_f
"
]
&&
_checkConf
"
$1
"
"
$_w_f
"
;
then
return
0
fi
done
...
...
@@ -3865,7 +3883,7 @@ renewAll() {
return
"
$rc
"
else
_ret
=
"
$rc
"
_err
"Error renew
$d
, Go ahead to next one
."
_err
"Error renew
$d
."
fi
fi
done
...
...
dnsapi/dns_cf.sh
View file @
9964e6eb
...
...
@@ -14,6 +14,8 @@ dns_cf_add() {
fulldomain
=
$1
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
CF_Key
=
""
CF_Email
=
""
...
...
@@ -29,8 +31,8 @@ dns_cf_add() {
fi
#save the api key and email to the account conf file.
_saveaccountconf CF_Key
"
$CF_Key
"
_saveaccountconf CF_Email
"
$CF_Email
"
_saveaccountconf
_mutable
CF_Key
"
$CF_Key
"
_saveaccountconf
_mutable
CF_Email
"
$CF_Email
"
_debug
"First detect the root zone"
if
!
_get_root
"
$fulldomain
"
;
then
...
...
@@ -83,6 +85,17 @@ dns_cf_add() {
dns_cf_rm
()
{
fulldomain
=
$1
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
CF_Key
=
""
CF_Email
=
""
_err
"You don't specify cloudflare api key and email yet."
_err
"Please create you key and try again."
return
1
fi
_debug
"First detect the root zone"
if
!
_get_root
"
$fulldomain
"
;
then
_err
"invalid domain"
...
...
dnsapi/dns_freedns.sh
View file @
9964e6eb
dnsapi/dns_ovh.sh
View file @
9964e6eb
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