From 1b39119de82dd9717943413023fd01f3ae4ee5ef Mon Sep 17 00:00:00 2001
From: Jose Carlos Luna <Jose.Carlos.Luna@cern.ch>
Date: Fri, 10 May 2024 18:29:55 +0200
Subject: [PATCH] Changed release message, and updated command line
documentation
---
.gitlab-ci.yml | 3 +--
configtools.go | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61c63e4..012a633 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,7 @@ release:
image: registry.gitlab.com/gitlab-org/release-cli:latest
script:
- FILE_URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/gocanary/${CI_COMMIT_TAG}/gocanary"
- - echo Release URL is $FILE_URL
- - release-cli create --name release-branch-$CI_JOB_ID --description "Some description"
+ - release-cli create --name "Release $CI_COMMIT_TAG" --description "Release for gocanary"
--tag-name $CI_COMMIT_TAG
--assets-link '{"name":"Binary","url":"'"$FILE_URL"'","link_type":"package"}'
rules:
diff --git a/configtools.go b/configtools.go
index af1caf7..79c8475 100644
--- a/configtools.go
+++ b/configtools.go
@@ -69,7 +69,7 @@ func init() {
gocanaryCmd.PersistentFlags().Uint16Var(&httpPort, "http-port", 80, "Port for http server")
gocanaryCmd.PersistentFlags().Uint16Var(&httpsPort, "https-port", 443, "Port for https server")
//autocert?
- gocanaryCmd.PersistentFlags().StringVar(&dnsAnswerWith, "dns-answer-with", "", "IP address to give as an answer to all DNS request, if empty NXDOMAIN")
+ gocanaryCmd.PersistentFlags().StringVar(&dnsAnswerWith, "dns-answer-with", "", "IP address to give as an answer to DNS request matching a canary, if empty NXDOMAIN")
gocanaryCmd.PersistentFlags().BoolVar(&dnsNotAnswer, "dns-not-answer", false, "Do not answer with any response")
gocanaryCmd.PersistentFlags().StringVar(&httpsCert, "https-cert", "cert.pem", "File contained the certificate in PEM format")
gocanaryCmd.PersistentFlags().StringVar(&httpsKey, "https-key", "cert.key", "File contained the certificate key in PEM format")
@@ -79,8 +79,8 @@ func init() {
gocanaryCmd.PersistentFlags().BoolVar(&dnsEnabled, "enable-dns", true, "Enable DNS listeners (tcp and udp)")
gocanaryCmd.PersistentFlags().BoolVar(&syslogEnabled, "enable-syslog", false, "Enable logging to syslog")
gocanaryCmd.PersistentFlags().BoolVar(&hardeningEnabled, "enable-hardening", true, "Enable hardening measures")
- gocanaryCmd.PersistentFlags().StringArrayVar(&domains, "domain", []string{}, "Only respond to this domain (can be specified multiple times)")
- gocanaryCmd.PersistentFlags().StringArrayVar(&autocertDomains, "autocert-domain", []string{}, "Enable let's encrypt autocertificate (can be specified multiple times), this will ignore https-cert and http-key options")
+ gocanaryCmd.PersistentFlags().StringArrayVar(&domains, "domain", []string{}, "Only respond to this domain (multiple accepted)")
+ gocanaryCmd.PersistentFlags().StringArrayVar(&autocertDomains, "autocert-domain", []string{}, "Enable let's encrypt autocertificate (multiple accepted), https-cert and http-key will be ignored")
exePath, err := os.Executable()
if err != nil {
--
GitLab