Release v1.2.4.5

britannic · Nov 22, 2020 · 323ef30 · 323ef30
1 parent 74a59cd
commit 323ef30
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,10 @@
 # Changelog
 
-## Release 1.2.4.4.1 (November 21, 2020)
+## Release 1.2.4.5 (November 21, 2020)
 
 * Fix bug preventing update-dnsmasq loading failover config file -safe switch is used
 * Update documentation to state the /config/user-data/blacklist.failover.cfg must first be created
+* Move debian repository to `https://raw.githubusercontent.com/britannic/debian-repo/master/blacklist/public/`
 
 ## Release 1.2.4.2 (August 14, 2020)
 

diff --git a/README.header b/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.4.4.1-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.4.5-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/)")
 
@@ -107,12 +107,13 @@ modification, are permitted provided that the following conditions are met:
 
 ## **Latest Version**
 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest](https://img.shields.io/badge/Release-v1.2.4.4.1-green.svg)](https://github.com/britannic/blacklist/releases/latest "Latest version")
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest](https://img.shields.io/badge/Release-v1.2.4.5-green.svg)](https://github.com/britannic/blacklist/releases/latest "Latest version")
 
-## Release 1.2.4.4 (November 21, 2020)
+## Release 1.2.4.5 (November 21, 2020)
 
 * Fix bug preventing update-dnsmasq loading failover config file -safe switch is used
 * Update documentation to state the /config/user-data/blacklist.failover.cfg must first be created
+* Move debian repository to https://raw.githubusercontent.com/britannic/debian-repo/master/blacklist/public/
 
 [[Top]](#contents)
 
@@ -155,7 +156,7 @@ configure
 set system package repository blacklist components main
 set system package repository blacklist description 'Britannic blacklist debian stretch repository'
 set system package repository blacklist distribution stretch
-set system package repository blacklist url 'https://raw.githubusercontent.com/britannic/debian-repo/master/blacklist/'
+set system package repository blacklist url 'https://raw.githubusercontent.com/britannic/debian-repo/master/blacklist/public/'
 commit;save;exit
 ```
 
@@ -178,8 +179,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.4.4.1_mips.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.4.1_mips.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.4.5_mips.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.5_mips.deb
 ```
 
 [[Top]](#contents)
@@ -196,8 +197,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.4.4.1_mipsel.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.4.1_mipsel.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.4.5_mipsel.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.5_mipsel.deb
 ```
 
 [[Top]](#contents)

diff --git a/README.md b/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.4.4.1-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.4.5-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/)")
 
@@ -107,12 +107,13 @@ modification, are permitted provided that the following conditions are met:
 
 ## **Latest Version**
 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest](https://img.shields.io/badge/Release-v1.2.4.4.1-green.svg)](https://github.com/britannic/blacklist/releases/latest "Latest version")
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest](https://img.shields.io/badge/Release-v1.2.4.5-green.svg)](https://github.com/britannic/blacklist/releases/latest "Latest version")
 
-## Release 1.2.4.4 (November 21, 2020)
+## Release 1.2.4.5 (November 21, 2020)
 
 * Fix bug preventing update-dnsmasq loading failover config file -safe switch is used
 * Update documentation to state the /config/user-data/blacklist.failover.cfg must first be created
+* Move debian repository to https://raw.githubusercontent.com/britannic/debian-repo/master/blacklist/public/
 
 [[Top]](#contents)
 
@@ -155,7 +156,7 @@ configure
 set system package repository blacklist components main
 set system package repository blacklist description 'Britannic blacklist debian stretch repository'
 set system package repository blacklist distribution stretch
-set system package repository blacklist url 'https://raw.githubusercontent.com/britannic/debian-repo/master/blacklist/'
+set system package repository blacklist url 'https://raw.githubusercontent.com/britannic/debian-repo/master/blacklist/public/'
 commit;save;exit
 ```
 
@@ -178,8 +179,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.4.4.1_mips.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.4.1_mips.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.4.5_mips.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.5_mips.deb
 ```
 
 [[Top]](#contents)
@@ -196,8 +197,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.4.4.1_mipsel.deb
-sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.4.1_mipsel.deb
+curl -L -O https://raw.githubusercontent.com/britannic/blacklist/master/edgeos-dnsmasq-blacklist_1.2.4.5_mipsel.deb
+sudo dpkg -i edgeos-dnsmasq-blacklist_1.2.4.5_mipsel.deb
 ```
 
 [[Top]](#contents)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.4.4.1
+1.2.4.5
diff --git a/aws.sh b/aws.sh
@@ -8,7 +8,8 @@ tag=${3}
 
 aptly repo add blacklist .
 aptly snapshot create blacklist-${tag} from repo blacklist
-aptly -gpg-key=11FDF4DBCDE11975 publish switch -component=main stretch blacklist-${tag}
+aptly -gpg-key=11FDF4DBCDE11975 publish switch stretch blacklist-${tag}
+# aptly publish snapshot -gpg-key=11FDF4DBCDE11975 -component=main -distribution=stretch blacklist-${tag}
 cd ../debian-repo
 git add --all
 git commit -am"Package repository release ${tag}"

diff --git a/edgeos-dnsmasq-blacklist_1.2.4.4.1_mips.deb b/edgeos-dnsmasq-blacklist_1.2.4.4.1_mips.deb
diff --git a/edgeos-dnsmasq-blacklist_1.2.4.4.1_mipsel.deb b/edgeos-dnsmasq-blacklist_1.2.4.4.1_mipsel.deb
diff --git a/index.md b/index.md
@@ -1,9 +1,10 @@
 # Changelog
 
-## Release 1.2.4.4.1 (November 21, 2020)
+## Release 1.2.4.5 (November 21, 2020)
 
 * Fix bug preventing update-dnsmasq loading failover config file -safe switch is used
 * Update documentation to state the /config/user-data/blacklist.failover.cfg must first be created
+* Move debian repository to `https://raw.githubusercontent.com/britannic/debian-repo/master/blacklist/public/`
 
 ## Release 1.2.4.2 (August 14, 2020)