summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBen Morrison <ben@gbmor.dev>2019-06-14 00:12:25 -0400
committerBen Morrison <ben@gbmor.dev>2019-06-14 00:12:33 -0400
commit1e0e919565dbd23e423fe9055a755a55bf971efb (patch)
tree67726213f05a039daf7022779740cde24dd685ba
parentdf8fa27ffa596e02d0560aa9238f194911c03e56 (diff)
downloadgetwtxt-1e0e919565dbd23e423fe9055a755a55bf971efb.tar.gz
updated config comments, format of makefile
-rw-r--r--Makefile6
-rw-r--r--getwtxt.yml15
2 files changed, 11 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index e781070..ee11e92 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,13 @@ PREFIX?=/usr/local
 _INSTDIR=$(PREFIX)
 BINDIR?=$(_INSTDIR)/getwtxt
 VERSION?=$(shell git tag | grep ^v | sort -V | tail -n 1)
-GOFLAGS?=-tags netgo \
-				 -ldflags '-X github.com/getwtxt/getwtxt/svc.Vers=${VERSION} -extldflags "-static"'
+GOFLAGS?=-tags netgo -ldflags '-X github.com/getwtxt/getwtxt/svc.Vers=${VERSION} -extldflags "-static"'
 
 getwtxt: getwtxt.go go.mod go.sum
 	@echo
 	@echo Building getwtxt. This may take a minute or two.
 	@mkdir -p logs
-	go build $(GOFLAGS) \
-		-o $@
+	go build $(GOFLAGS) -o $@
 	@echo
 	@echo ...Done\!
 
diff --git a/getwtxt.yml b/getwtxt.yml
index 34e9cb3..df92aca 100644
--- a/getwtxt.yml
+++ b/getwtxt.yml
@@ -64,11 +64,11 @@ AssetsDirectory: "assets"
 # logs.
 StdoutLogging: false
 
-# Log files getwtxt will use. Requests will be logged
-# to RequestLog, while everything else will go into
-# MessageLog. These can be relative or absolute paths.
-MessageLog: "logs/message.log"
-RequestLog: "logs/request.log"
+# Log files getwtxt will use. HTTP Requests will be
+# recorded in RequestLog, while everything else will go
+# into MessageLog, such as errors and notices.
+MessageLog: "./logs/message.log"
+RequestLog: "./logs/request.log"
 
 # This is the interval between data pushes from the 
 # in-memory cache to the on-disk database. 
@@ -86,7 +86,10 @@ Instance:
   # The name of your instance.
   SiteName: "getwtxt"
 
-  # Your instance's web address.
+  # Your instance's web address. If
+  # BehindProxy is set to false, this
+  # is also used to map incoming
+  # requests.
   URL: "https://twtxt.example.com"
 
   # Your name.