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
645135bf
Unverified
Commit
645135bf
authored
Jul 16, 2020
by
neil
Committed by
GitHub
Jul 16, 2020
Browse files
Merge pull request #3051 from szepeviktor/patch-2
Upgrade Travis image
parents
8cbbd022
eb9005ad
Changes
6
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
645135bf
language
:
shell
dist
:
trusty
dist
:
bionic
os
:
-
linux
...
...
deploy/vault_cli.sh
View file @
645135bf
...
...
@@ -43,7 +43,7 @@ vault_cli_deploy() {
return
1
fi
VAULT_CMD
=
$(
which
vault
)
VAULT_CMD
=
$(
command
-v
vault
)
if
[
!
$?
]
;
then
_err
"cannot find vault binary!"
return
1
...
...
dnsapi/dns_cloudns.sh
View file @
645135bf
...
...
@@ -69,7 +69,7 @@ dns_cloudns_rm() {
for
i
in
$(
echo
"
$response
"
|
tr
'{'
"
\n
"
|
grep
"
$record
"
)
;
do
record_id
=
$(
echo
"
$i
"
|
tr
','
"
\n
"
|
grep
-E
'^"id"'
|
sed
-re
's/^\"id\"\:\"([0-9]+)\"$/\1/g'
)
if
[
!
-z
"
$record_id
"
]
;
then
if
[
-n
"
$record_id
"
]
;
then
_debug zone
"
$zone
"
_debug host
"
$host
"
_debug record
"
$record
"
...
...
@@ -91,7 +91,7 @@ dns_cloudns_rm() {
#################### Private functions below ##################################
_dns_cloudns_init_check
()
{
if
[
!
-z
"
$CLOUDNS_INIT_CHECK_COMPLETED
"
]
;
then
if
[
-n
"
$CLOUDNS_INIT_CHECK_COMPLETED
"
]
;
then
return
0
fi
...
...
@@ -164,7 +164,7 @@ _dns_cloudns_http_api_call() {
_debug CLOUDNS_SUB_AUTH_ID
"
$CLOUDNS_SUB_AUTH_ID
"
_debug CLOUDNS_AUTH_PASSWORD
"
$CLOUDNS_AUTH_PASSWORD
"
if
[
!
-z
"
$CLOUDNS_SUB_AUTH_ID
"
]
;
then
if
[
-n
"
$CLOUDNS_SUB_AUTH_ID
"
]
;
then
auth_user
=
"sub-auth-id=
$CLOUDNS_SUB_AUTH_ID
"
else
auth_user
=
"auth-id=
$CLOUDNS_AUTH_ID
"
...
...
dnsapi/dns_cyon.sh
View file @
645135bf
...
...
@@ -66,7 +66,7 @@ _cyon_load_credentials() {
_debug
"Save credentials to account.conf"
_saveaccountconf CY_Username
"
${
CY_Username
}
"
_saveaccountconf CY_Password_B64
"
$CY_Password_B64
"
if
[
!
-z
"
${
CY_OTP_Secret
}
"
]
;
then
if
[
-n
"
${
CY_OTP_Secret
}
"
]
;
then
_saveaccountconf CY_OTP_Secret
"
$CY_OTP_Secret
"
else
_clearaccountconf CY_OTP_Secret
...
...
@@ -164,7 +164,7 @@ _cyon_login() {
# todo: instead of just checking if the env variable is defined, check if we actually need to do a 2FA auth request.
# 2FA authentication with OTP?
if
[
!
-z
"
${
CY_OTP_Secret
}
"
]
;
then
if
[
-n
"
${
CY_OTP_Secret
}
"
]
;
then
_info
" - Authorising with OTP code..."
if
!
_exists oathtool
;
then
...
...
dnsapi/dns_dgon.sh
View file @
645135bf
...
...
@@ -122,12 +122,12 @@ dns_dgon_rm() {
## check for what we are looking for: "type":"A","name":"$_sub_domain"
record
=
"
$(
echo
"
$domain_list
"
| _egrep_o
"
\"
id
\"\s
*
\:\s
*
\"
*[0-9]+
\"
*[^}]*
\"
name
\"\s
*
\:\s
*
\"
$_sub_domain
\"
[^}]*
\"
data
\"\s
*
\:\s
*
\"
$txtvalue
\"
"
)
"
if
[
!
-z
"
$record
"
]
;
then
if
[
-n
"
$record
"
]
;
then
## we found records
rec_ids
=
"
$(
echo
"
$record
"
| _egrep_o
"id
\"\s
*
\:\s
*
\"
*[0-9]+"
| _egrep_o
"[0-9]+"
)
"
_debug rec_ids
"
$rec_ids
"
if
[
!
-z
"
$rec_ids
"
]
;
then
if
[
-n
"
$rec_ids
"
]
;
then
echo
"
$rec_ids
"
|
while
IFS
=
read
-r
rec_id
;
do
## delete the record
## delete URL for removing the one we dont want
...
...
@@ -218,7 +218,7 @@ _get_base_domain() {
## we got part of a domain back - grep it out
found
=
"
$(
echo
"
$domain_list
"
| _egrep_o
"
\"
name
\"\s
*
\:\s
*
\"
$_domain
\"
"
)
"
## check if it exists
if
[
!
-z
"
$found
"
]
;
then
if
[
-n
"
$found
"
]
;
then
## exists - exit loop returning the parts
sub_point
=
$(
_math
$i
- 1
)
_sub_domain
=
$(
printf
"%s"
"
$fulldomain
"
|
cut
-d
.
-f
1-
"
$sub_point
"
)
...
...
dnsapi/dns_yandex.sh
View file @
645135bf
...
...
@@ -25,7 +25,7 @@ dns_yandex_add() {
_PDD_get_record_ids
||
return
1
_debug
"Record_ids:
$record_ids
"
if
[
!
-z
"
$record_ids
"
]
;
then
if
[
-n
"
$record_ids
"
]
;
then
_info
"All existing
$subdomain
records from
$domain
will be removed at the very end."
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