Skip to content
Snippets Groups Projects
Unverified Commit 2a96a501 authored by Max Adamo's avatar Max Adamo
Browse files

fixed readme section

parent 17fd31bf
No related branches found
No related tags found
No related merge requests found
Pipeline #74668 passed
Stage: upload_linux_shell
Stage: upload_linux_amd64_binary
Stage: upload_windows_amd64_binary
Hide whitespace changes
Inline Side-by-side
README.md
+ 1
− 1
View file @ 2a96a501
...@@ -43,8 +43,8 @@ Options: ...@@ -43,8 +43,8 @@ Options:
--vault-token=VAULTTOKEN Vault access token --vault-token=VAULTTOKEN Vault access token
--cert-name=CERTNAME Certificate name --cert-name=CERTNAME Certificate name
--team-name=TEAMNAME Team name: swd, it, ne, ti,... --team-name=TEAMNAME Team name: swd, it, ne, ti,...
--type=TYPE Type, EV or OV
--days=DAYS Days before expiration [default: 30] --days=DAYS Days before expiration [default: 30]
--type=TYPE Type, EV or OV [default: EV]
--cert-destination=CERTDESTINATION Cert Destination [default: /etc/ssl/certs/<cert-name>.crt] --cert-destination=CERTDESTINATION Cert Destination [default: /etc/ssl/certs/<cert-name>.crt]
--fullchain-destination=FULLCHAINDESTINATION Full Chain Destination[default: /etc/ssl/certs/<cert-name>_fullchain.crt] --fullchain-destination=FULLCHAINDESTINATION Full Chain Destination[default: /etc/ssl/certs/<cert-name>_fullchain.crt]
--key-destination=KEYDESTINATION Key Destination [default: /etc/ssl/private/<cert-name>.key] --key-destination=KEYDESTINATION Key Destination [default: /etc/ssl/private/<cert-name>.key]
......
acme-downloader.sh
+ 25
− 19
View file @ 2a96a501
...@@ -87,8 +87,8 @@ usage() { ...@@ -87,8 +87,8 @@ usage() {
echo " --vault-token (Vault access token)" echo " --vault-token (Vault access token)"
echo " --cert-name (Certificate name)" echo " --cert-name (Certificate name)"
echo " --team-name (Team name: swd, it, neteng, nmaas ...)" echo " --team-name (Team name: swd, it, neteng, nmaas ...)"
echo " --type (OV or EV)"
echo " --days [OPTIONAL check days before expiration. Default: 30)" echo " --days [OPTIONAL check days before expiration. Default: 30)"
echo " --type [OPTIONAL. OV or EV. Default: EV]"
echo " --cert-destination [OPTIONAL Default: ${CERT_BASE}/<cert-name>.crt]" echo " --cert-destination [OPTIONAL Default: ${CERT_BASE}/<cert-name>.crt]"
echo " --fullchain-destination [OPTIONAL Default: ${CERT_BASE}/<cert-name>_fullchain.crt]" echo " --fullchain-destination [OPTIONAL Default: ${CERT_BASE}/<cert-name>_fullchain.crt]"
echo " --key-destination [OPTIONAL Default: ${KEY_BASE}/<cert-name>.key]" echo " --key-destination [OPTIONAL Default: ${KEY_BASE}/<cert-name>.key]"
...@@ -189,17 +189,21 @@ if [[ -n $UPDATE ]]; then ...@@ -189,17 +189,21 @@ if [[ -n $UPDATE ]]; then
clean_up $UPDATE_STATUS clean_up $UPDATE_STATUS
fi fi
if [[ -z $REDIS_TOKEN ]] || [[ -z $VAULT_TOKEN ]] || [[ -z $CERT_NAME ]] || [[ -z $TEAM_NAME ]]; then if [[ -z $REDIS_TOKEN ]] || [[ -z $VAULT_TOKEN ]] || [[ -z $CERT_NAME ]] || [[ -z $TEAM_NAME ]] || [[ -z $TYPE ]]; then
echo -e "\n--redis-token, --vault-token, --cert-name and --team-name are mandatory\n" echo -e "\n--redis-token, --vault-token, --cert-name, --team-name and --type are mandatory\n"
usage usage
fi fi
TYPE=$(echo $TYPE | tr '[:lower:]' '[:upper:]') # [[ -z $TYPE ]] && TYPE="EV" # let's default to EV type
[[ -z $TYPE ]] && TYPE="EV" # let's default to EV type
if [[ $TYPE != "EV" ]] && [[ $TYPE != "OV" ]]; then if [[ $TYPE != "EV" ]] && [[ $TYPE != "OV" ]]; then
echo "type must be either EV, ev, OV, ov" echo "type must be either EV, ev, OV, ov"
usage usage
fi fi
type=$(echo $TYPE | tr '[:upper:]' '[:lower:]')
TYPE=$(echo $TYPE | tr '[:lower:]' '[:upper:]')
PROVIDER="sectigo_${type}"
if [[ -z $WILDCARD ]]; then if [[ -z $WILDCARD ]]; then
MODIFIED_CERT_NAME=$CERT_NAME MODIFIED_CERT_NAME=$CERT_NAME
else else
...@@ -222,23 +226,25 @@ if openssl x509 -checkend $MINUTES -noout -in $FULLCHAIN_DESTINATION &>/dev/null ...@@ -222,23 +226,25 @@ if openssl x509 -checkend $MINUTES -noout -in $FULLCHAIN_DESTINATION &>/dev/null
fi fi
# download certificates and delete the last empty line if it exists and remove the first line from Webdis # download certificates and delete the last empty line if it exists and remove the first line from Webdis
CERTNAME_PREFIX="${PROVIDER}_${UNDERSCORED_CERT_NAME}"
WILDCARD_CERTNAME_PREFIX="${PROVIDER}_wildcard_${UNDERSCORED_CERT_NAME}"
if [[ -z $WILDCARD ]]; then if [[ -z $WILDCARD ]]; then
curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_${UNDERSCORED_CERT_NAME}_pem.txt >$TMP_CERT curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_${CERTNAME_PREFIX}_pem.txt >$TMP_CERT
curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_${UNDERSCORED_CERT_NAME}_fullchain_pem.txt >$TMP_FULLCHAIN curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_${CERTNAME_PREFIX}_fullchain_pem.txt >$TMP_FULLCHAIN
curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_${UNDERSCORED_CERT_NAME}_chain_pem.txt >$TMP_CA curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_${CERTNAME_PREFIX}_chain_pem.txt >$TMP_CA
curl -s -H "X-Vault-Token: ${VAULT_TOKEN}" ${VAULT_URL}/${TEAM_NAME}/${CERT_NAME}/vault_${UNDERSCORED_CERT_NAME}_key | jq -j .data.value >$TMP_KEY curl -s -H "X-Vault-Token: ${VAULT_TOKEN}" ${VAULT_URL}/${TEAM_NAME}/${CERT_NAME}/vault_${CERTNAME_PREFIX}_key | jq -j .data.value >$TMP_KEY
else else
if [[ "$TEAM_NAME" == "puppet" ]]; then if [[ "$TEAM_NAME" == "puppet" ]]; then # TLD Wildcard
curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:common:redis_sectigo_ov_${UNDERSCORED_CERT_NAME}_pem.txt >$TMP_CERT curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:common:redis_${WILDCARD_CERTNAME_PREFIX}_pem.txt >$TMP_CERT
curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:common:redis_sectigo_ov_${UNDERSCORED_CERT_NAME}_fullchain_pem.txt >$TMP_FULLCHAIN curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:common:redis_${WILDCARD_CERTNAME_PREFIX}_fullchain_pem.txt >$TMP_FULLCHAIN
curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:common:redis_sectigo_ov_${UNDERSCORED_CERT_NAME}_chain_pem.txt >$TMP_CA curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:common:redis_${WILDCARD_CERTNAME_PREFIX}_chain_pem.txt >$TMP_CA
curl -s -H "X-Vault-Token: ${VAULT_TOKEN}" ${VAULT_URL}/${TEAM_NAME}/common/vault_sectigo_ov_wildcard_${UNDERSCORED_CERT_NAME}_key | jq -j .data.value >$TMP_KEY curl -s -H "X-Vault-Token: ${VAULT_TOKEN}" ${VAULT_URL}/${TEAM_NAME}/common/vault_${WILDCARD_CERTNAME_PREFIX}_key | jq -j .data.value >$TMP_KEY
else else
curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_sectigo_ov_${UNDERSCORED_CERT_NAME}_pem.txt >$TMP_CERT curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_${WILDCARD_CERTNAME_PREFIX}_pem.txt >$TMP_CERT
curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_sectigo_ov_${UNDERSCORED_CERT_NAME}_fullchain_pem.txt >$TMP_FULLCHAIN curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_${WILDCARD_CERTNAME_PREFIX}_fullchain_pem.txt >$TMP_FULLCHAIN
curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_sectigo_ov_${UNDERSCORED_CERT_NAME}_chain_pem.txt >$TMP_CA curl -s -u redis:$REDIS_TOKEN ${REDIS_URL}/${TEAM_NAME}:${CERT_NAME}:redis_${WILDCARD_CERTNAME_PREFIX}_chain_pem.txt >$TMP_CA
curl -s -H "X-Vault-Token: ${VAULT_TOKEN}" ${VAULT_URL}/${TEAM_NAME}/${CERT_NAME}/vault_sectigo_ov_wildcard_${UNDERSCORED_CERT_NAME}_key | jq -j .data.value >$TMP_KEY curl -s -H "X-Vault-Token: ${VAULT_TOKEN}" ${VAULT_URL}/${TEAM_NAME}/${CERT_NAME}/vault_${WILDCARD_CERTNAME_PREFIX}_key | jq -j .data.value >$TMP_KEY
echo "curl -s -H "X-Vault-Token: ${VAULT_TOKEN}" ${VAULT_URL}/${CERT_NAME}/${TEAM_NAME}/vault_sectigo_ov_wildcard_${UNDERSCORED_CERT_NAME}_key"
fi fi
fi fi
......
build-bash.sh
+ 11
− 0
View file @ 2a96a501
...@@ -2,6 +2,17 @@ ...@@ -2,6 +2,17 @@
# #
# upload a copy of the script with version number and buildtime # upload a copy of the script with version number and buildtime
# #
# == Example
#
# git checkout master # make your changes ...
# git commit "my new change"
# git push
# git tag v1.2.3
# git pushall-tags
#
# And DO NOT RUN THIS SCRIPT. Just push and the CI will
# take care of running the script and uploading the artifact
#
if [ "$#" -gt 0 ]; then if [ "$#" -gt 0 ]; then
PROG_VERSION=$1 PROG_VERSION=$1
else else
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment