Release v1.2.3

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## Releases
 
-### Release v1.2.2 (May 25, 2020)
+### Prerelease v1.2.3 (May 25, 2020)
+
+* Only load failover /config/user-data/blacklist.failover.cfg if API config fails
+
+### Prerelease v1.2.2 (May 25, 2020)
 
 * Add source OSID Mobile Blocklist
 * Update documentation

README.header

@@ -1,6 +1,6 @@
 # **UBNT edgeos-dnsmasq-blacklist dnsmasq DNS Blacklisting and Redirection**
 
-[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/britannic/blacklist/blob/master/LICENSE.txt "View the software license here")[![Version](https://img.shields.io/badge/version-v1.2.2-green.svg)](https://github.com/britannic/blacklist "Latest version")[![GoDoc](https://godoc.org/github.com/britannic/blacklist?status.svg)](https://godoc.org/github.com/britannic/blacklist  "Go documentation")[![Build Status](https://travis-ci.org/britannic/blacklist.svg?branch=master)](https://travis-ci.org/britannic/blacklist  "Build status for this version")[![Coverage Status](https://coveralls.io/repos/github/britannic/blacklist/badge.svg?branch=master "")](https://coveralls.io/github/britannic/blacklist?branch=master "Test coverage status for this version")[![Go Report Card](https://goreportcard.com/badge/gojp/goreportcard)](https://goreportcard.com/report/github.com/britannic/blacklist "Quality of Go code for this version")
+[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/britannic/blacklist/blob/master/LICENSE.txt "View the software license here")[![Version](https://img.shields.io/badge/version-v1.2.3-green.svg)](https://github.com/britannic/blacklist "Latest version")[![GoDoc](https://godoc.org/github.com/britannic/blacklist?status.svg)](https://godoc.org/github.com/britannic/blacklist  "Go documentation")[![Build Status](https://travis-ci.org/britannic/blacklist.svg?branch=master)](https://travis-ci.org/britannic/blacklist  "Build status for this version")[![Coverage Status](https://coveralls.io/repos/github/britannic/blacklist/badge.svg?branch=master "")](https://coveralls.io/github/britannic/blacklist?branch=master "Test coverage status for this version")[![Go Report Card](https://goreportcard.com/badge/gojp/goreportcard)](https://goreportcard.com/report/github.com/britannic/blacklist "Quality of Go code for this version")
 
 Follow the conversation @ [community.ubnt.com](https://community.ubnt.com/t5/EdgeRouter/DNS-Adblocking-amp-Blacklisting-dnsmasq-Configuration/td-p/2215008/jump-to/first-unread-message "Follow the conversation about this software in the EdgeRouter forum (https://community.ubnt.com/t5/EdgeRouter/)")
 
@@ -105,7 +105,7 @@ modification, are permitted provided that the following conditions are met:
 
 ## **Latest Version**
 
-       [![Latest](https://img.shields.io/badge/Release-v1.2.2-green.svg)](https://github.com/britannic/blacklist/releases/latest  "Latest version")
+       [![Latest](https://img.shields.io/badge/Release-v1.2.3-green.svg)](https://github.com/britannic/blacklist/releases/latest  "Latest version")
 
 ### Release v1.2.2 (May 25, 2020)
 
@@ -178,8 +178,8 @@ sudo apt-get update && sudo apt-get install edgeos-dnsmasq-blacklist
 ### **EdgeRouter ERLite-3, ERPoe-5, ER4, UniFi-Gateway-3 & UniFi-Gateway-4**
 
 ```bash
-curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.2_mips.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.2_mips.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.3_mips.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.3_mips.deb
 ```
 
 [[Top]](#contents)
@@ -196,8 +196,8 @@ delete system image
 * Now download and install the edgeos-dnsmasq-blacklist package
 
 ```bash
-curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.2_mipsel.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.2_mipsel.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.3_mipsel.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.3_mipsel.deb
 ```
 
 [[Top]](#contents)

README.md

@@ -1,6 +1,6 @@
 # **UBNT edgeos-dnsmasq-blacklist dnsmasq DNS Blacklisting and Redirection**
 
-[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/britannic/blacklist/blob/master/LICENSE.txt "View the software license here")[![Version](https://img.shields.io/badge/version-v1.2.2-green.svg)](https://github.com/britannic/blacklist "Latest version")[![GoDoc](https://godoc.org/github.com/britannic/blacklist?status.svg)](https://godoc.org/github.com/britannic/blacklist  "Go documentation")[![Build Status](https://travis-ci.org/britannic/blacklist.svg?branch=master)](https://travis-ci.org/britannic/blacklist  "Build status for this version")[![Coverage Status](https://coveralls.io/repos/github/britannic/blacklist/badge.svg?branch=master "")](https://coveralls.io/github/britannic/blacklist?branch=master "Test coverage status for this version")[![Go Report Card](https://goreportcard.com/badge/gojp/goreportcard)](https://goreportcard.com/report/github.com/britannic/blacklist "Quality of Go code for this version")
+[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/britannic/blacklist/blob/master/LICENSE.txt "View the software license here")[![Version](https://img.shields.io/badge/version-v1.2.3-green.svg)](https://github.com/britannic/blacklist "Latest version")[![GoDoc](https://godoc.org/github.com/britannic/blacklist?status.svg)](https://godoc.org/github.com/britannic/blacklist  "Go documentation")[![Build Status](https://travis-ci.org/britannic/blacklist.svg?branch=master)](https://travis-ci.org/britannic/blacklist  "Build status for this version")[![Coverage Status](https://coveralls.io/repos/github/britannic/blacklist/badge.svg?branch=master "")](https://coveralls.io/github/britannic/blacklist?branch=master "Test coverage status for this version")[![Go Report Card](https://goreportcard.com/badge/gojp/goreportcard)](https://goreportcard.com/report/github.com/britannic/blacklist "Quality of Go code for this version")
 
 Follow the conversation @ [community.ubnt.com](https://community.ubnt.com/t5/EdgeRouter/DNS-Adblocking-amp-Blacklisting-dnsmasq-Configuration/td-p/2215008/jump-to/first-unread-message "Follow the conversation about this software in the EdgeRouter forum (https://community.ubnt.com/t5/EdgeRouter/)")
 
@@ -105,7 +105,7 @@ modification, are permitted provided that the following conditions are met:
 
 ## **Latest Version**
 
-       [![Latest](https://img.shields.io/badge/Release-v1.2.2-green.svg)](https://github.com/britannic/blacklist/releases/latest  "Latest version")
+       [![Latest](https://img.shields.io/badge/Release-v1.2.3-green.svg)](https://github.com/britannic/blacklist/releases/latest  "Latest version")
 
 ### Release v1.2.2 (May 25, 2020)
 
@@ -178,8 +178,8 @@ sudo apt-get update && sudo apt-get install edgeos-dnsmasq-blacklist
 ### **EdgeRouter ERLite-3, ERPoe-5, ER4, UniFi-Gateway-3 & UniFi-Gateway-4**
 
 ```bash
-curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.2_mips.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.2_mips.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.3_mips.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.3_mips.deb
 ```
 
 [[Top]](#contents)
@@ -196,8 +196,8 @@ delete system image
 * Now download and install the edgeos-dnsmasq-blacklist package
 
 ```bash
-curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.2_mipsel.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.2_mipsel.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.3_mipsel.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.3_mipsel.deb
 ```
 
 [[Top]](#contents)

VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

main.go

@@ -20,7 +20,7 @@ var (
 	initEnvirons = initEnv
 	prog         = basename(os.Args[0])
 	prefix       = fmt.Sprintf("%s: ", prog)
-	defCfgFile   = "/config/user-data/blacklist.cfg"
+	defCfgFile   = "/config/user-data/blacklist.failover.cfg"
 )
 
 func main() {
@@ -97,13 +97,21 @@ func initEnv() (c *e.Config, err error) {
 	o := getOpts()
 	o.setArgs()
 	c = o.initEdgeOS()
-	if err = c.Blacklist(o.getCFG(c)); err != nil {
-		fmt.Fprintf(os.Stderr, "Removing stale dnsmasq blacklist files, because %v\n", err.Error())
-		if err = files(c).Remove(); err != nil {
-			fmt.Fprintf(os.Stderr, "%v", err.Error())
+
+	if *o.File == "" {
+		if err = c.Blacklist(o.getCFG(c)); err != nil {
+			if _, err = os.Stat(defCfgFile); !os.IsNotExist(err) {
+				*o.File = defCfgFile
+			}
+			if err = c.Blacklist(o.getCFG(c)); err != nil {
+				fmt.Fprintf(os.Stderr, "Removing stale dnsmasq blacklist files, because %v\n", err.Error())
+				if err = files(c).Remove(); err != nil {
+					fmt.Fprintf(os.Stderr, "%v", err.Error())
+				}
+				reloadDNS(c)
+				exitCmd(0)
+			}
 		}
-		reloadDNS(c)
-		exitCmd(0)
 	}
 	return c, err
 }

main_test.go

@@ -355,16 +355,23 @@ func TestGetCFG(t *testing.T) {
 		c.Blacklist(o.getCFG(c))
 		So(c.String(), ShouldEqual, mainGetConfig)
 
-		*o.MIPS64 = "amd64"
-		c = o.initEdgeOS()
-		c.Blacklist(o.getCFG(c))
-		So(c.String(), ShouldEqual, "{\n  \"nodes\": [{\n  }]\n}")
-
 		origDefCfgFile := defCfgFile
 		defCfgFile = "internal/testdata/config.test.boot"
 		c.Blacklist(o.getCFG(c))
 		So(c.String(), ShouldEqual, mainGetConfig)
 		defCfgFile = origDefCfgFile
+
+		origFile := *o.File
+		*o.File = "internal/testdata/config.test.boot"
+		c.Blacklist(o.getCFG(c))
+		So(c.String(), ShouldEqual, mainGetConfig)
+		*o.File = origFile
+
+		*o.MIPS64 = "amd64"
+		c = o.initEdgeOS()
+		c.Blacklist(o.getCFG(c))
+		So(c.String(), ShouldEqual, "{\n  \"nodes\": [{\n  }]\n}")
+
 	})
 }
 

opts.go

@@ -46,11 +46,6 @@ func cleanArgs(args []string) (r []string) {
 
 // getCFG returns a e.ConfLoader
 func (o *opts) getCFG(c *e.Config) e.ConfLoader {
-	if *o.File == "" {
-		if _, err := os.Stat(defCfgFile); !os.IsNotExist(err) {
-			*o.File = defCfgFile
-		}
-	}
 	if _, err := os.Stat(*o.File); !os.IsNotExist(err) {
 		var (
 			err error