Leon/rename to dnstapir prefix

.gitignore

@@ -26,6 +26,7 @@ go.work
 
 # Local additions
 tapir-cli
+dnstapir-cli
 version.go
 
 # Ignore rpm build directory and related stuff
@@ -36,3 +37,10 @@ version.go
 #!rpm/SOURCES/tapir-renew.timer
 #!rpm/SOURCES/tapir-cli.yaml
 #!rpm/SPECS/tapir-cli.spec
+
+# Ignore deb build directory and related stuff
+*.deb
+deb/
+!deb/DEBIAN/control
+!deb/DEBIAN/postinst
+!deb/DEBIAN/postrm

Makefile

@@ -1,4 +1,4 @@
-PROG:=tapir-cli
+PROG:=dnstapir-cli
 # -----
 VERSION:=`cat ./VERSION`
 COMMIT:=`git describe --dirty=+WiP --always`
@@ -10,7 +10,7 @@ GOOS ?= $(shell uname -s | tr A-Z a-z)
 GO:=GOOS=$(GOOS) CGO_ENABLED=0 go
 # GO:=GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=1 go
 
-SPECFILE:=rpm/SPECS/tapir-cli.spec
+SPECFILE:=rpm/SPECS/dnstapir-cli.spec
 
 default: ${PROG}
 
@@ -37,6 +37,10 @@ clean:
 	@rm -f *.tar.gz
 	@rm -f rpm/SOURCES/*.tar.gz
 	@rm -rf rpm/{BUILD,BUILDROOT,SRPMS,RPMS}
+	@rm -rf deb/usr
+	@rm -rf deb/etc
+	@rm -rf deb/var
+	@rm -f *.deb
 
 install:
 	install -b -c -s ${PROG} /usr/local/bin/
@@ -52,4 +56,13 @@ srpm: tarball
 	rpmbuild -bs --define "%_topdir ./rpm" --undefine=dist $(SPECFILE)
 	test -z "$(outdir)" || cp rpm/SRPMS/*.src.rpm "$(outdir)"
 
+deb: build
+	mkdir -p deb/usr/bin
+	mkdir -p deb/etc/dnstapir/certs
+	mkdir -p deb/usr/lib/systemd/system
+	cp dnstapir-cli deb/usr/bin
+	cp rpm/SOURCES/dnstapir-renew.service deb/usr/lib/systemd/system
+	cp rpm/SOURCES/dnstapir-renew.timer deb/usr/lib/systemd/system
+	dpkg-deb -b deb/ $(PROG)-$(VERSION).deb
+
 .PHONY: build clean

cmd/root.go

@@ -29,8 +29,8 @@ type Services struct {
 }
 
 var rootCmd = &cobra.Command{
-	Use:   "tapir-cli",
-	Short: "CLI  utility used to interact with TAPIR-POP, i.e. the TAPIR Policy Processor",
+	Use:   "dnstapir-cli",
+	Short: "CLI  utility used to interact with POP, i.e. the DNS TAPIR Policy Processor",
 }
 
 func Execute() {
@@ -46,13 +46,13 @@ func init() {
 	cobra.OnInitialize(RootInitConfig)
 	cobra.OnInitialize(initConfig)
 
-	rootCmd.PersistentFlags().BoolVarP(&standalone, "standalone", "", false, "Run in standalone mode, do not connect to TAPIR-POP")
+	rootCmd.PersistentFlags().BoolVarP(&standalone, "standalone", "", false, "Run in standalone mode, do not connect to running POP process")
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", tapir.DefaultTapirCliCfgFile,
 		fmt.Sprintf("config file (default is %s)", tapir.DefaultTapirCliCfgFile))
 	rootCmd.PersistentFlags().BoolVarP(&tapir.GlobalCF.Verbose, "verbose", "v", false, "Verbose mode")
 	rootCmd.PersistentFlags().BoolVarP(&tapir.GlobalCF.Debug, "debug", "d", false, "Debugging output")
 	rootCmd.PersistentFlags().BoolVarP(&tapir.GlobalCF.ShowHdr, "headers", "H", false, "Show column headers")
-	rootCmd.PersistentFlags().BoolVarP(&tapir.GlobalCF.UseTLS, "tls", "", true, "Use a TLS connection to TAPIR-POP")
+	rootCmd.PersistentFlags().BoolVarP(&tapir.GlobalCF.UseTLS, "tls", "", true, "Use a TLS connection to POP process")
 
 	rootCmd.AddCommand(cmd.PopCmd)
 	rootCmd.AddCommand(cmd.DawgCmd)

deb/DEBIAN/control

@@ -0,0 +1,8 @@
+Package: dnstapir-cli
+Architecture: all
+Version: 0.3
+Section: misc
+Maintainer: Leon Fernandez <leon.fernandez@internetstiftelsen.se>
+Priority: optional
+Standards-Version: 4.7.0
+Description: DNS TAPIR Edge Command-line Interface

deb/DEBIAN/postinst

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+getent group dnstapir || addgroup dnstapir
+getent passwd tapir-renew || adduser --ingroup dnstapir --system tapir-renew
+
+if [ -z "$2" ]; then
+    chown root:dnstapir /etc/dnstapir/certs
+    chmod 770 /etc/dnstapir/certs
+fi

go.mod

@@ -1,11 +1,11 @@
-module tapir-cli
+module dnstapir-cli
 
 go 1.23.0
 
 toolchain go1.23.7
 
 require (
-	github.com/dnstapir/tapir v0.0.0-20251007100851-ee7f55056696
+	github.com/dnstapir/tapir v0.0.0-20251029102003-58142cabe113
 	github.com/go-playground/validator/v10 v10.9.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.18.1

go.sum

@@ -14,6 +14,14 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnN
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
 github.com/dnstapir/tapir v0.0.0-20251007100851-ee7f55056696 h1:D19z5WkV/GvuuLP6gtVr5FJ/IuXrQ0Wqdr0uYqdCO0k=
 github.com/dnstapir/tapir v0.0.0-20251007100851-ee7f55056696/go.mod h1:A6BFxLXbsLJNj80yFy/OWVb7RmLyFIvXDgvFtRSN3ho=
+github.com/dnstapir/tapir v0.0.0-20251021092904-2eb01be1892f h1:ABBvHE3lJ/xC6ttbFow1AEWwpcl5TTueEeCGvxPKsZk=
+github.com/dnstapir/tapir v0.0.0-20251021092904-2eb01be1892f/go.mod h1:A6BFxLXbsLJNj80yFy/OWVb7RmLyFIvXDgvFtRSN3ho=
+github.com/dnstapir/tapir v0.0.0-20251022094937-4e072a3e8241 h1:PFOjSs4F6JPcJ5tfyTcpCei7SMSGgoAVA7aWLCr2vUM=
+github.com/dnstapir/tapir v0.0.0-20251022094937-4e072a3e8241/go.mod h1:A6BFxLXbsLJNj80yFy/OWVb7RmLyFIvXDgvFtRSN3ho=
+github.com/dnstapir/tapir v0.0.0-20251029090753-1649e63084ae h1:lSEtaeteZt5bQWdFvhOIwtKoIQHu5MstAQaZS63cRVc=
+github.com/dnstapir/tapir v0.0.0-20251029090753-1649e63084ae/go.mod h1:A6BFxLXbsLJNj80yFy/OWVb7RmLyFIvXDgvFtRSN3ho=
+github.com/dnstapir/tapir v0.0.0-20251029102003-58142cabe113 h1:yIaIHM9Jn66Zh9Gbi85QGrmRChj+KPCM/mAnZIZFuuo=
+github.com/dnstapir/tapir v0.0.0-20251029102003-58142cabe113/go.mod h1:A6BFxLXbsLJNj80yFy/OWVb7RmLyFIvXDgvFtRSN3ho=
 github.com/eclipse/paho.golang v0.21.0 h1:cxxEReu+iFbA5RrHfRGxJOh8tXZKDywuehneoeBeyn8=
 github.com/eclipse/paho.golang v0.21.0/go.mod h1:GHF6vy7SvDbDHBguaUpfuBkEB5G6j0zKxMG4gbh6QRQ=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=

main.go

@@ -5,7 +5,7 @@
 package main
 
 import (
-	"tapir-cli/cmd"
+	"dnstapir-cli/cmd"
 )
 
 func main() {

rpm/SOURCES/tapir-renew.service → rpm/SOURCES/dnstapir-renew.service

@@ -1,12 +1,12 @@
 [Unit]
-Description=DNSTAPIR EDGE Certificate Renewal
+Description=DNS TAPIR Edge Certificate Renewal
 After=network-online.target
 
 [Service]
 Type=oneshot
-User=tapir-renew
+User=dnstapir-renew
 Group=dnstapir
-ExecStart=/usr/bin/tapir-cli --standalone renew \
+ExecStart=/usr/bin/dnstapir-cli --standalone renew \
     --renew-datakey /etc/dnstapir/certs/datakey-priv.json \
     --renew-cacert-out /etc/dnstapir/certs/ca.crt \
     --renew-clientkey /etc/dnstapir/certs/tls.key \

rpm/SOURCES/tapir-renew.timer → rpm/SOURCES/dnstapir-renew.timer

@@ -1,5 +1,5 @@
 [Unit]
-Description=Renew DNSTAPIR mTLS certificate every week
+Description=Renew DNS TAPIR mTLS certificate every week
 ConditionPathExists=/etc/dnstapir/certs/datakey-priv.json
 ConditionPathExists=/etc/dnstapir/certs/ca.crt
 ConditionPathExists=/etc/dnstapir/certs/tls.key

rpm/SPECS/tapir-cli.spec → rpm/SPECS/dnstapir-cli.spec

@@ -1,19 +1,19 @@
-Name:          tapir-cli
+Name:          dnstapir-cli
 # NOTE: Version must match VERSION file - validated by Makefile srpm target
 Version:       v0.3
 Release:       1%{?dist}
 Group:         dnstapir/edge
-Summary:       DNSTAPIR EDGE Cli Tool
+Summary:       DNS TAPIR EDGE Cli Tool
 License:       BSD
 URL:           https://www.github.com/dnstapir/cli
 Source0:       %{name}-%{version}.tar.gz
-Source1:       tapir-renew.service
-Source2:       tapir-renew.timer
+Source1:       dnstapir-renew.service
+Source2:       dnstapir-renew.timer
 BuildRequires: git
 BuildRequires: golang
 
 %description
-DNSTAPIR EDGE ClI Tool for managing an EDGE deployment
+DNS TAPIR EDGE ClI Tool for managing an EDGE deployment
 
 # Disable building of debug packages for RHEL (we include symbols per default)
 %if 0%{?rhel} >= 9
@@ -42,13 +42,13 @@ install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}
 %attr(0770,root,dnstapir) %dir %{_sysconfdir}/dnstapir
 %attr(0770,root,dnstapir) %dir %{_sysconfdir}/dnstapir/certs
 %attr(0770,root,dnstapir) %{_bindir}/%{name}
-%attr(0660,-,dnstapir) %ghost %{_sysconfdir}/dnstapir/tapir-cli.yaml
-%attr(0644,root,dnstapir) %{_unitdir}/tapir-renew.service
-%attr(0644,root,dnstapir) %{_unitdir}/tapir-renew.timer
+%attr(0660,-,dnstapir) %ghost %{_sysconfdir}/dnstapir/dnstapir-cli.yaml
+%attr(0644,root,dnstapir) %{_unitdir}/dnstapir-renew.service
+%attr(0644,root,dnstapir) %{_unitdir}/dnstapir-renew.timer
 
 %pre
 /usr/bin/getent group dnstapir || /usr/sbin/groupadd -r dnstapir
-/usr/bin/getent passwd tapir-renew || /usr/sbin/useradd -r -d /etc/dnstapir -G dnstapir -s /sbin/nologin tapir-renew
+/usr/bin/getent passwd dnstapir-renew || /usr/sbin/useradd -r -d /etc/dnstapir -G dnstapir -s /sbin/nologin dnstapir-renew
 
 %post