Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2018-04-10 14:02:03 +0300
committerJacob Vosmaer <jacob@gitlab.com>2018-04-10 14:02:03 +0300
commitae67abeb83ff4b3296d98c745bf3ad30c5781d16 (patch)
tree18211d3cd9bcb008952d5f3a57dce7a7c6d7790a /main.go
parentf91e0c92cdd7803dcc35dcc39f0edc6226c44f93 (diff)
Make listening flags easier to find
Diffstat (limited to 'main.go')
-rw-r--r--main.go21
1 files changed, 15 insertions, 6 deletions
diff --git a/main.go b/main.go
index c5243207..123a416f 100644
--- a/main.go
+++ b/main.go
@@ -18,6 +18,12 @@ var VERSION = "dev"
// REVISION stores the information about the git revision of application
var REVISION = "HEAD"
+func init() {
+ flag.Var(&listenHTTP, "listen-http", "The address(es) to listen on for HTTP requests")
+ flag.Var(&listenHTTPS, "listen-https", "The address(es) to listen on for HTTPS requests")
+ flag.Var(&listenProxy, "listen-proxy", "The address(es) to listen on for proxy requests")
+}
+
var (
pagesRootCert = flag.String("root-cert", "", "The default path to file certificate to serve static pages")
pagesRootKey = flag.String("root-key", "", "The default path to file certificate to serve static pages")
@@ -34,7 +40,15 @@ var (
logFormat = flag.String("log-format", "text", "The log output format: 'text' or 'json'")
logVerbose = flag.Bool("log-verbose", false, "Verbose logging")
- disableCrossOriginRequests = flag.Bool("disable-cross-origin-requests", false, "Disable cross-origin requests")
+ disableCrossOriginRequests = flag.Bool("disable-cross-origin-requests", false, "Disable cross-origin requests")
+
+ // See init()
+ listenHTTP MultiStringFlag
+ listenHTTPS MultiStringFlag
+ listenProxy MultiStringFlag
+)
+
+var (
errArtifactSchemaUnsupported = errors.New("artifacts-server scheme must be either http:// or https://")
errArtifactsServerTimeoutValue = errors.New("artifacts-server-timeout must be greater than or equal to 1")
)
@@ -84,13 +98,8 @@ func configFromFlags() appConfig {
func appMain() {
var showVersion = flag.Bool("version", false, "Show version")
- var listenHTTP, listenHTTPS, listenProxy MultiStringFlag
- flag.Var(&listenHTTP, "listen-http", "The address(es) to listen on for HTTP requests")
- flag.Var(&listenHTTPS, "listen-https", "The address(es) to listen on for HTTPS requests")
- flag.Var(&listenProxy, "listen-proxy", "The address(es) to listen on for proxy requests")
flag.String(flag.DefaultConfigFlagname, "", "path to config file")
-
flag.Parse()
printVersion(*showVersion, VERSION)