From 37102f1e98234fac7717bb5ff98d2ed9823b7731 Mon Sep 17 00:00:00 2001
From: Massimiliano Adamo <massimiliano.adamo@geant.org>
Date: Sun, 11 Apr 2021 15:06:29 +0200
Subject: [PATCH] use UPX
---
build.sh | 24 ++++++++++++------------
main.go | 22 +++++++++++++++++-----
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/build.sh b/build.sh
index 663b778..74c6d61 100755
--- a/build.sh
+++ b/build.sh
@@ -30,17 +30,17 @@ if [ $? -gt 0 ]; then
fi
echo ""
-#while true; do
-# read -p "Do you wish to run upx against ${BIN_NAME}? (y/n) " yn
-# case $yn in
-# [Yy]*)
-# echo ""
-# run_upx
-# break
-# ;;
-# [Nn]*) break ;;
-# *) echo "Please answer yes or no." ;;
-# esac
-#done
+while true; do
+ read -p "Do you wish to run upx against ${BIN_NAME}? (y/n) " yn
+ case $yn in
+ [Yy]*)
+ echo ""
+ run_upx
+ break
+ ;;
+ [Nn]*) break ;;
+ *) echo "Please answer yes or no." ;;
+ esac
+done
echo -e "\nthe binary was compiled and it is avilable as:\n - ${GOPATH}/bin/${BIN_NAME}\n"
diff --git a/main.go b/main.go
index 0b4a112..8971d4f 100644
--- a/main.go
+++ b/main.go
@@ -29,6 +29,10 @@ var (
GroupID int
RedisBaseURL string
VaultBaseURL string
+ VaultURL string
+ RedisCertURL string
+ RedisCAURL string
+ RedisFullChainURL string
certificateDestination string
fullchainDestination string
keyDestination string
@@ -394,6 +398,7 @@ Options:
--fullchain-destination=FULLCHAINDESTINATION Full Chain Destination[default: %v/<cert-name>_fullchain.crt]
--key-destination=KEYDESTINATION Key Destination [default: %v/<cert-name>.key]
--ca-destination=CADESTINATION CA Destination [default: %v/COMODO_<type>.crt]
+ --wildcard The certificate is wildcard
`, CertBase, CertBase, KeyBase, CertBase)
arguments, _ := docopt.Parse(usage, nil, true, appVersion, false)
@@ -430,7 +435,7 @@ Options:
VaultToken := arguments["--vault-token"].(string)
CertName := arguments["--cert-name"].(string)
- CertNameUndercored := strings.Replace(CertName, ".", "_", -1)
+ CertNameUnderscored := strings.Replace(CertName, ".", "_", -1)
TeamName := arguments["--team-name"].(string)
RedisToken := arguments["--redis-token"].(string)
Type = arguments["--type"].(string)
@@ -442,10 +447,17 @@ Options:
}
RedisBaseURL = "https://redis.geant.org/GET"
VaultBaseURL = "https://vault.geant.org/v1"
- VaultURL := fmt.Sprintf("%v/%v/%v/vault_%v_key", VaultBaseURL, TeamName, CertName, CertNameUndercored)
- RedisCertURL := fmt.Sprintf("%v/%v:%v:redis_%v_pem.txt", RedisBaseURL, TeamName, CertName, CertNameUndercored)
- RedisCAURL := fmt.Sprintf("%v/%v:%v:redis_%v_chain_pem.txt", RedisBaseURL, TeamName, CertName, CertNameUndercored)
- RedisFullChainURL := fmt.Sprintf("%v/%v:%v:redis_%v_fullchain_pem.txt", RedisBaseURL, TeamName, CertName, CertNameUndercored)
+ if arguments["--wildcard"] == true {
+ VaultURL = fmt.Sprintf("%v/%v/common/vault_sectigo_ov_wildcard_%v_key", VaultBaseURL, TeamName, CertNameUnderscored)
+ RedisCertURL = fmt.Sprintf("%v/%v:common:redis_sectigo_ov_%v_pem.txt", RedisBaseURL, TeamName, CertNameUnderscored)
+ RedisCAURL = fmt.Sprintf("%v/%v:common:redis_sectigo_ov_%v_chain_pem.txt", RedisBaseURL, TeamName, CertNameUnderscored)
+ RedisFullChainURL = fmt.Sprintf("%v/%v:common:redis_sectigo_ov_%v_fullchain_pem.txt", RedisBaseURL, TeamName, CertNameUnderscored)
+ } else {
+ VaultURL = fmt.Sprintf("%v/%v/%v/vault_%v_key", VaultBaseURL, TeamName, CertName, CertNameUnderscored)
+ RedisCertURL = fmt.Sprintf("%v/%v:%v:redis_%v_pem.txt", RedisBaseURL, TeamName, CertName, CertNameUnderscored)
+ RedisCAURL = fmt.Sprintf("%v/%v:%v:redis_%v_chain_pem.txt", RedisBaseURL, TeamName, CertName, CertNameUnderscored)
+ RedisFullChainURL = fmt.Sprintf("%v/%v:%v:redis_%v_fullchain_pem.txt", RedisBaseURL, TeamName, CertName, CertNameUnderscored)
+ }
if arguments["--cert-destination"] == fmt.Sprintf(filepath.Join(CertBase, "<cert-name>.crt")) {
certificateDestination = fmt.Sprintf(filepath.Join(CertBase, fmt.Sprintf("%v.crt", CertName)))
--
GitLab