From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 15 Jan 2017 17:02:27 +0000 (+0300)
Subject: Configurable default paths to spool and log
X-Git-Tag: 0.2^2~12
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=12bdd93791fdf0a79f990a6cc1cb7eae8b26f31d;p=nncp.git

Configurable default paths to spool and log
---

diff --git a/common.mk b/common.mk
index dee003f..4b1f43a 100644
--- a/common.mk
+++ b/common.mk
@@ -1,15 +1,21 @@
-.PHONY: doc
+PREFIX ?= /usr/local
 
 SENDMAIL ?= /usr/sbin/sendmail
-PREFIX ?= /usr/local
 CFGPATH ?= $(PREFIX)/etc/nncp.yaml
+SPOOLPATH ?= /var/spool/nncp
+LOGPATH ?= /var/log/nncp.log
+
 BINDIR = $(DESTDIR)$(PREFIX)/bin
 INFODIR = $(DESTDIR)$(PREFIX)/info
 DOCDIR = $(DESTDIR)$(PREFIX)/share/doc/nncp
+
 LDFLAGS = \
 	-X cypherpunks.ru/nncp.Version=$(VERSION) \
 	-X cypherpunks.ru/nncp.DefaultCfgPath=$(CFGPATH) \
-	-X cypherpunks.ru/nncp.DefaultSendmailPath=$(SENDMAIL)
+	-X cypherpunks.ru/nncp.DefaultSendmailPath=$(SENDMAIL) \
+	-X cypherpunks.ru/nncp.DefaultSpoolPath=$(SPOOLPATH) \
+	-X cypherpunks.ru/nncp.DefaultLogPath=$(LOGPATH)
+
 ALL = \
 	nncp-mail \
 	nncp-call \
@@ -72,6 +78,8 @@ test:
 clean:
 	rm -f $(ALL)
 
+.PHONY: doc
+
 doc:
 	$(MAKE) -C doc
 
diff --git a/src/cypherpunks.ru/nncp/cfg.go b/src/cypherpunks.ru/nncp/cfg.go
index 6083db9..773cc15 100644
--- a/src/cypherpunks.ru/nncp/cfg.go
+++ b/src/cypherpunks.ru/nncp/cfg.go
@@ -35,6 +35,8 @@ const (
 var (
 	DefaultCfgPath      string = "/usr/local/etc/nncp.yaml"
 	DefaultSendmailPath string = "/usr/sbin/sendmail"
+	DefaultSpoolPath    string = "/var/spool/nncp"
+	DefaultLogPath      string = "/var/log/nncp.log"
 )
 
 type NodeYAML struct {
diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-newnode/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-newnode/main.go
index 5aeebf6..b32a32d 100644
--- a/src/cypherpunks.ru/nncp/cmd/nncp-newnode/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-newnode/main.go
@@ -73,8 +73,8 @@ func main() {
 				Sendmail: []string{nncp.DefaultSendmailPath},
 			},
 		},
-		Spool: "/path/to/spool",
-		Log:   "/path/to/log.file",
+		Spool: nncp.DefaultSpoolPath,
+		Log:   nncp.DefaultLogPath,
 	}
 	raw, err := yaml.Marshal(&cfg)
 	if err != nil {