Bump version and re-release, repos were out of sync

Adds support for generating certificates using Let's Encrypt or other ACME providers

See merge request idk/reseed-tools!5

.gitignore

@@ -7,3 +7,7 @@ i2pseeds.su3
 onion.key
 tmp/
 i2p-tools-*
+*.crl
+*.crt
+*.pem
+plugin

Makefile

@@ -1,6 +1,6 @@
 
-VERSION=0.0.6
-APP=i2p-tools-1
+VERSION=0.0.9
+APP=reseed-tools
 USER_GH=eyedeekay
 
 GOOS?=$(shell uname -s | tr A-Z a-z)
@@ -26,13 +26,13 @@ edit:
 	cat README.md | gothub edit -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(APP) -t v$(VERSION) -d -
 
 upload: binary tar
-	gothub upload -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(APP) -t v$(VERSION) -f ../i2p-tools.tar.xz -n "i2p-tools.tar.xz"
+	gothub upload -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(APP) -t v$(VERSION) -f ../reseed-tools.tar.xz -n "reseed-tools.tar.xz"
 
 build: gofmt
-	/usr/lib/go-$(MIN_GO_VERSION)/bin/go build $(ARG) -o i2p-tools-$(GOOS)-$(GOARCH)
+	/usr/lib/go-$(MIN_GO_VERSION)/bin/go build $(ARG) -o reseed-tools-$(GOOS)-$(GOARCH)
 
 clean:
-	rm i2p-tools-* *.key *.i2pKeys *.crt *.crl *.pem tmp -rf
+	rm reseed-tools-* *.key *.i2pKeys *.crt *.crl *.pem tmp -rfv
 
 binary:
 	GOOS=darwin GOARCH=amd64 make build
@@ -43,12 +43,13 @@ binary:
 	GOOS=openbsd GOARCH=amd64 make build
 	GOOS=freebsd GOARCH=386 make build
 	GOOS=freebsd GOARCH=amd64 make build
+	GOOS=windows GOARCH=amd64 make build
 
 tar:
-	tar --exclude="./.git" --exclude="./tmp"  -cvf ../i2p-tools.tar.xz .
+	tar --exclude="./.git" --exclude="./tmp"  -cvf ../reseed-tools.tar.xz .
 
 install:
-	install -m755 i2p-tools-$(GOOS)-$(GOARCH) /usr/local/bin/i2p-tools
+	install -m755 reseed-tools-$(GOOS)-$(GOARCH) /usr/local/bin/reseed-tools
 	install -m755 etc/init.d/reseed /etc/init.d/reseed
 
 ### You shouldn't need to use these now that the go mod require rule is fixed,
@@ -56,10 +57,10 @@ install:
 ## versions behaved the same way. -idk
 
 build-fork:
-	/usr/lib/go-$(MIN_GO_VERSION)/bin/go build -o i2p-tools-idk
+	/usr/lib/go-$(MIN_GO_VERSION)/bin/go build -o reseed-tools-idk
 
 build-unfork:
-	/usr/lib/go-$(MIN_GO_VERSION)/bin/go build -o i2p-tools-md
+	/usr/lib/go-$(MIN_GO_VERSION)/bin/go build -o reseed-tools-md
 
 fork:
 	sed -i 's|idk/reseed-tools|idk/reseed-tools|g' main.go cmd/*.go reseed/*.go su3/*.go
@@ -67,7 +68,7 @@ fork:
 
 unfork:
 	sed -i 's|idk/reseed-tools|idk/reseed-tools|g' main.go cmd/*.go reseed/*.go su3/*.go
-	sed -i 's|RTradeLtd/i2p-tools-1|idk/reseed-tools|g' main.go cmd/*.go reseed/*.go su3/*.go
+	sed -i 's|RTradeLtd/reseed-tools|idk/reseed-tools|g' main.go cmd/*.go reseed/*.go su3/*.go
 	make gofmt build-unfork
 
 gofmt:
@@ -76,12 +77,12 @@ gofmt:
 try:
 	mkdir -p tmp && \
 		cd tmp && \
-		../i2p-tools-$(GOOS)-$(GOARCH) reseed --signer=you@mail.i2p --netdb=/home/idk/.i2p/netDb --tlsHost=your-domain.tld --onion --p2p --i2p --littleboss=start
+		../reseed-tools-$(GOOS)-$(GOARCH) reseed --signer=you@mail.i2p --netdb=/home/idk/.i2p/netDb --tlsHost=your-domain.tld --onion --p2p --i2p --littleboss=start
 
 stop:
 	mkdir -p tmp && \
 		cd tmp && \
-		../i2p-tools-$(GOOS)-$(GOARCH) reseed --signer=you@mail.i2p --netdb=/home/idk/.i2p/netDb --tlsHost=your-domain.tld --onion --p2p --i2p --littleboss=stop
+		../reseed-tools-$(GOOS)-$(GOARCH) reseed --signer=you@mail.i2p --netdb=/home/idk/.i2p/netDb --tlsHost=your-domain.tld --onion --p2p --i2p --littleboss=stop
 
 docker:
 	docker build -t eyedeekay/reseed .
@@ -109,7 +110,7 @@ docker-server:
 		--publish 8443:8443 \
 		--restart=always \
 		--volume /var/lib/i2p/i2p-config/netDb:/var/lib/i2p/i2p-config/netDb:z \
-		--volume reseed-keyss:/var/lib/i2p/i2p-config/reseed \
+		--volume reseed-keys:/var/lib/i2p/i2p-config/reseed \
 		eyedeekay/reseed \
 			--signer=hankhill19580@gmail.com
 	docker logs -f reseed
@@ -147,3 +148,32 @@ jar: gojava
 	echo $(JAVA_HOME)
 	./gojava -v -o reseed.jar -s . build ./reseed
 
+plugins: binary
+	GOOS=darwin GOARCH=amd64 make su3s
+	GOOS=linux GOARCH=386 make su3s
+	GOOS=linux GOARCH=amd64 make su3s
+	GOOS=linux GOARCH=arm make su3s
+	GOOS=linux GOARCH=arm64 make su3s
+	GOOS=openbsd GOARCH=amd64 make su3s
+	GOOS=freebsd GOARCH=386 make su3s
+	GOOS=freebsd GOARCH=amd64 make su3s
+	GOOS=windows GOARCH=amd64 make su3s
+
+su3s:
+	i2p.plugin.native -name=reseed-tools-$(GOOS)-$(GOARCH) \
+		-signer=hankhill19580@gmail.com \
+		-version "$(VERSION)" \
+		-author=hankhill19580@gmail.com \
+		-autostart=true \
+		-clientname=reseed-tools-$(GOOS)-$(GOARCH) \
+		-command="\$$PLUGIN/lib/reseed-tools-$(GOOS)-$(GOARCH)s -dir=\$$PLUGIN/lib reseed --signer=you@mail.i2p --netdb=\$$CONFIG/netDb --onion --i2p" \
+		-consolename="Reseed Tools" \
+		-delaystart="200" \
+		-desc="Reseed Tools Plugin" \
+		-exename=reseed-tools-$(GOOS)-$(GOARCH) \
+		-targetos="$(GOOS)" \
+		-license=MIT
+	unzip -o reseed-tools-$(GOOS)-$(GOARCH).zip -d reseed-tools-$(GOOS)-$(GOARCH)-zip
+
+#export sumbblinux=`sha256sum "../reseed-tools-linux.su3"`
+#export sumbbwindows=`sha256sum "../reseed-tools-windows.su3"`

content/index.html

@@ -0,0 +1,10 @@
+<h1 id="you-have-found-an-i2p-reseed">You have found an I2P Reseed</h1>
+<p>Maybe it was by accident, or maybe you visited the URL because you saw it in the software somewhere. While we’ve got your attention, we’re going to take this opportunity to tell you a little about what we do here. I2P is a peer-to-peer network which uses “Garlic Routing” to maintain privacy. Reseed nodes help you get connected to I2P for the first time, and even though you should only have to use them once in a great while, they are very important services.</p>
+<h2 id="to-learn-more-about-i2p-visit"><a href="https://geti2p.net">To learn more about I2P, visit</a></h2>
+<p><a href="https://geti2p.net"><img src="images/reseed.png" alt="Help reseed" /></a></p>
+<ul>
+<li><a href="https://geti2p.net/en/docs/reseed">Learn more about reseeds here:</a></li>
+<li><a href="https://geti2p.net/en/get-involved/guides/reseed">Learn how to run a reseed here:</a></li>
+<li><a href="https://i2pgit.org/idk/reseed-tools">Read the reseed server code and learn about more reseed options here:</a></li>
+</ul>
+<p>Here on purpose? Here’s a one-time link to a reseed bundle for you.</p>

main.go

@@ -18,7 +18,7 @@ func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU() / 2)
 
 	app := cli.NewApp()
-	app.Name = "i2p-tools-1"
+	app.Name = "reseed-tools"
 	app.Version = "0.1.7"
 	app.Usage = "I2P tools and reseed server"
 	app.Author = "eyedeekay"

su3/su3.go

@@ -23,16 +23,20 @@ const (
 	SigTypeRSAWithSHA384   = uint16(5)
 	SigTypeRSAWithSHA512   = uint16(6)
 
-	ContentTypeUnknown = uint8(0)
-	ContentTypeRouter  = uint8(1)
-	ContentTypePlugin  = uint8(2)
-	ContentTypeReseed  = uint8(3)
-	ContentTypeNews    = uint8(4)
+	ContentTypeUnknown   = uint8(0)
+	ContentTypeRouter    = uint8(1)
+	ContentTypePlugin    = uint8(2)
+	ContentTypeReseed    = uint8(3)
+	ContentTypeNews      = uint8(4)
+	ContentTypeBlocklist = uint8(5)
 
 	FileTypeZIP   = uint8(0)
 	FileTypeXML   = uint8(1)
 	FileTypeHTML  = uint8(2)
 	FileTypeXMLGZ = uint8(3)
+	FileTypeTXTGZ = uint8(4)
+	FileTypeDMG   = uint8(5)
+	FileTypeEXE   = uint8(6)
 
 	magicBytes = "I2Psu3"
 )