Merge pull request #62 from guggero/config-fix

config+shushtar: check config after loading lnd.conf

Author: jamaljsr

README.md

@@ -96,7 +96,14 @@ $ ./shushtar \
   --faraday.min_monitored=48h
 ```
 
-You can also store the configuration in a persistent `lnd.conf` file so you do not need to type in the command line arguments every time you start the server. Just remember to use the appropriate prefixes as necessary.
+You can also store the configuration in a persistent `lnd.conf` file so you do
+not need to type in the command line arguments every time you start the server.
+Just remember to use the appropriate prefixes as necessary.
+
+Also. make sure to include the `lnd` general options in the `[Application Options]`
+section because the section name `[Lnd]` is not unique anymore because of how we
+combine the configurations of all daemons. This will hopefully be fixed in a
+future release.
 
 Example `lnd.conf`:
 
@@ -106,7 +113,6 @@ httpslisten=0.0.0.0:443
 letsencrypt=1
 letsencrypthost=loop.merchant.com
 
-[Lnd]
 lnd.lnddir=~/.lnd
 lnd.alias=merchant
 lnd.externalip=loop.merchant.com

config.go

@@ -33,7 +33,7 @@ var (
 	faradayDefaultConfig = faraday.DefaultConfig()
 	loopDefaultConfig    = loopd.DefaultConfig()
 
-	defaultLetsEncryptDir = filepath.Join(lnd.DefaultLndDir, "letsencrypt")
+	defaultLetsEncryptDir = "letsencrypt"
 )
 
 // Config is the main configuration struct of shushtar. It contains all config
@@ -58,7 +58,6 @@ type Config struct {
 func defaultConfig() *Config {
 	return &Config{
 		HTTPSListen:    defaultHTTPSListen,
-		LetsEncryptDir: defaultLetsEncryptDir,
 		Lnd:            &lndDefaultConfig,
 		Faraday:        &faradayDefaultConfig,
 		Loop:           &loopDefaultConfig,

shushtar.go

@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"github.com/lightningnetwork/lnd/lncfg"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -22,7 +23,6 @@ import (
 	"github.com/lightninglabs/loop/loopd"
 	"github.com/lightninglabs/loop/looprpc"
 	"github.com/lightningnetwork/lnd"
-	"github.com/lightningnetwork/lnd/lncfg"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lntest/wait"
 	"github.com/lightningnetwork/lnd/macaroons"
@@ -100,7 +100,19 @@ func (g *Shushtar) Run() error {
 		return err
 	}
 
+	// Load the configuration, and parse any command line options. This
+	// function will also set up logging properly.
+	g.cfg.Lnd, err = loadLndConfig(g.cfg)
+	if err != nil {
+		return err
+	}
+
 	// Validate the shushtar config options.
+	if g.cfg.LetsEncryptDir == "" {
+		g.cfg.LetsEncryptDir = filepath.Join(
+			g.cfg.Lnd.LndDir, defaultLetsEncryptDir,
+		)
+	}
 	g.cfg.LetsEncryptDir = lncfg.CleanAndExpandPath(g.cfg.LetsEncryptDir)
 	if g.cfg.LetsEncrypt && g.cfg.LetsEncryptHost == "" {
 		return fmt.Errorf("host must be set when using let's encrypt")
@@ -113,14 +125,7 @@ func (g *Shushtar) Run() error {
 		return fmt.Errorf("please set a strong password for the UI, "+
 			"at least %d characters long", uiPasswordMinLength)
 	}
-
-	// Load the configuration, and parse any command line options. This
-	// function will also set up logging properly.
-	g.cfg.Lnd, err = loadLndConfig(g.cfg)
-	if err != nil {
-		return err
-	}
-
+	
 	// Initiate our listeners. For now, we only support listening on one
 	// port at a time because we can only pass in one pre-configured RPC
 	// listener into lnd.