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
c650ae0e
Unverified
Commit
c650ae0e
authored
Jul 03, 2020
by
neil
Committed by
GitHub
Jul 03, 2020
Browse files
Merge pull request #3015 from TonyGravagno/dev
Trivial text changes
parents
9ed435d0
94787d53
Changes
8
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
c650ae0e
...
...
@@ -188,28 +188,28 @@ _dlg_versions() {
if
_exists
"
${
ACME_OPENSSL_BIN
:-
openssl
}
"
;
then
${
ACME_OPENSSL_BIN
:-
openssl
}
version 2>&1
else
echo
"
$ACME_OPENSSL_BIN
doesn't exist
s
."
echo
"
$ACME_OPENSSL_BIN
doesn't exist."
fi
echo
"apache:"
if
[
"
$_APACHECTL
"
]
&&
_exists
"
$_APACHECTL
"
;
then
$_APACHECTL
-V
2>&1
else
echo
"apache doesn't exist
s
."
echo
"apache doesn't exist."
fi
echo
"nginx:"
if
_exists
"nginx"
;
then
nginx
-V
2>&1
else
echo
"nginx doesn't exist
s
."
echo
"nginx doesn't exist."
fi
echo
"socat:"
if
_exists
"socat"
;
then
socat
-V
2>&1
else
_debug
"socat doesn't exist
s
."
_debug
"socat doesn't exist."
fi
}
...
...
@@ -2801,10 +2801,10 @@ _setApache() {
apacheVer
=
"
$(
$_APACHECTL
-V
|
grep
"Server version:"
|
cut
-d
:
-f
2 |
cut
-d
" "
-f
2 |
cut
-d
'/'
-f
2
)
"
_debug
"apacheVer"
"
$apacheVer
"
apacheMaj
e
r
=
"
$(
echo
"
$apacheVer
"
|
cut
-d
.
-f
1
)
"
apacheMaj
o
r
=
"
$(
echo
"
$apacheVer
"
|
cut
-d
.
-f
1
)
"
apacheMinor
=
"
$(
echo
"
$apacheVer
"
|
cut
-d
.
-f
2
)
"
if
[
"
$apacheVer
"
]
&&
[
"
$apacheMaj
e
r$apacheMinor
"
-ge
"24"
]
;
then
if
[
"
$apacheVer
"
]
&&
[
"
$apacheMaj
o
r$apacheMinor
"
-ge
"24"
]
;
then
echo
"
Alias /.well-known/acme-challenge
$ACME_DIR
...
...
@@ -5519,7 +5519,7 @@ revoke() {
fi
fi
else
_info
"Domain key file doesn't exist
s
."
_info
"Domain key file doesn't exist."
fi
_info
"Try account key."
...
...
deploy/kong.sh
View file @
c650ae0e
#!/usr/bin/env sh
# If certificate already exist it will update only cert and key not touching other parameter
# If certificate
doesn't exist it will only upload cert and key and not set other parameter
# If certificate already exist
s
it will update only cert and key
,
not touching other parameter
s
# If certificate doesn't exist it will only upload cert and key
,
and not set other parameter
s
# Note that we deploy full chain
# Written by Geoffroi Genot <ggenot@voxbone.com>
...
...
dnsapi/dns_ali.sh
View file @
c650ae0e
...
...
@@ -181,6 +181,7 @@ _describe_records_query() {
_clean
()
{
_check_exist_query
"
$_domain
"
"
$_sub_domain
"
# do not correct grammar here
if
!
_ali_rest
"Check exist records"
"ignore"
;
then
return
1
fi
...
...
dnsapi/dns_dgon.sh
View file @
c650ae0e
...
...
@@ -22,7 +22,7 @@ dns_dgon_add() {
txtvalue
=
$2
DO_API_KEY
=
"
${
DO_API_KEY
:-
$(
_readaccountconf_mutable DO_API_KEY
)
}
"
# Check if API Key Exist
# Check if API Key Exist
s
if
[
-z
"
$DO_API_KEY
"
]
;
then
DO_API_KEY
=
""
_err
"You did not specify DigitalOcean API key."
...
...
@@ -77,7 +77,7 @@ dns_dgon_rm() {
txtvalue
=
$2
DO_API_KEY
=
"
${
DO_API_KEY
:-
$(
_readaccountconf_mutable DO_API_KEY
)
}
"
# Check if API Key Exist
# Check if API Key Exist
s
if
[
-z
"
$DO_API_KEY
"
]
;
then
DO_API_KEY
=
""
_err
"You did not specify DigitalOcean API key."
...
...
dnsapi/dns_dynv6.sh
View file @
c650ae0e
...
...
@@ -18,7 +18,7 @@ dns_dynv6_add() {
if
!
_contains
"
$_your_hosts
"
"
$_host
"
;
then
_debug
"The host is
$_host
and the record
$_record
"
_debug
"Dynv6 returned
$_your_hosts
"
_err
"The host
$_host
does not exist
s
on your dynv6 account"
_err
"The host
$_host
does not exist on your dynv6 account"
return
1
fi
_debug
"found host on your account"
...
...
@@ -49,7 +49,7 @@ dns_dynv6_rm() {
if
!
_contains
"
$_your_hosts
"
"
$_host
"
;
then
_debug
"The host is
$_host
and the record
$_record
"
_debug
"Dynv6 returned
$_your_hosts
"
_err
"The host
$_host
does not exist
s
on your dynv6 account"
_err
"The host
$_host
does not exist on your dynv6 account"
return
1
fi
_debug
"found host on your account"
...
...
dnsapi/dns_gd.sh
View file @
c650ae0e
...
...
@@ -91,7 +91,7 @@ dns_gd_rm() {
fi
if
!
_contains
"
$response
"
"
$txtvalue
"
;
then
_info
"The record
i
s not exist
ing
, skip"
_info
"The record
doe
s not exist, skip"
return
0
fi
...
...
dnsapi/dns_hetzner.sh
View file @
c650ae0e
...
...
@@ -155,7 +155,7 @@ _get_root() {
if
[
"
$HETZNER_Zone_ID
"
]
;
then
_debug
"Found, using:
$HETZNER_Zone_ID
"
if
!
_hetzner_rest GET
"zones/
${
HETZNER_Zone_ID
}
"
;
then
_debug
"Zone with id '
$HETZNER_Zone_ID
' not exist
s
."
_debug
"Zone with id '
$HETZNER_Zone_ID
'
does
not exist."
_cleardomainconf
"
$domain_param_name
"
unset
HETZNER_Zone_ID
else
...
...
dnsapi/dns_kinghost.sh
View file @
c650ae0e
...
...
@@ -37,7 +37,7 @@ dns_kinghost_add() {
_debug
"Getting txt records"
_kinghost_rest GET
"dns"
"name=
$fulldomain
&content=
$txtvalue
"
#This API call returns "status":"ok" if dns record does not exist
s
#This API call returns "status":"ok" if dns record does not exist
#We are creating a new txt record here, so we expect the "ok" status
if
!
echo
"
$response
"
|
grep
'"status":"ok"'
>
/dev/null
;
then
_err
"Error"
...
...
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