Fix bin name. Fix template path

calaos · Jul 19, 2023 · 31a6fe9 · 31a6fe9
1 parent ac0d52f
commit 31a6fe9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 GOCMD=go
 GOTEST=$(GOCMD) test
 GOVET=$(GOCMD) vet
-BINARY_NAME=calaos-ddns
+BINARY_NAME=calaos_ddns
 VERSION?=1.0.0
 
 GREEN  := $(shell tput -Txterm setaf 2)

diff --git a/debian/calaos-ddns.install b/debian/calaos-ddns.install
@@ -1,2 +1,2 @@
-bin/calaos-ddns usr/bin
+bin/calaos_ddns usr/bin
 haproxy/haproxy.template usr/share/calaos-ddns
diff --git a/debian/calaos-ddns.service b/debian/calaos-ddns.service
@@ -7,4 +7,5 @@ ExecStart=/usr/bin/calaos_ddns update
 Environment="HOME=/home/root"
 Environment="CALAOS_HAPROXY_PATH=/mnt/calaos/haproxy"
 Environment="CALAOS_CERT_FILE=/mnt/calaos/ssl/haproxy"
-Environment="CALAOS_CONFIG=/mnt/calaos/config"
+Environment="CALAOS_CONFIG=/mnt/calaos/config"
+Environment="CALAOS_HAPROXY_TEMPLATE_PATH=/usr/share/calaos-ddns"
diff --git a/main.go b/main.go
@@ -203,7 +203,7 @@ func cmdRegister(cmd *cli.Cmd) {
 						fmt.Println(errorRed(CharAbort), "Failed to write certificate:", err)
 					}
 
-					templateFile := filepath.Join(env.GetOrDefaultString("CALAOS_HAPROXY_PATH", "/etc/haproxy"), "haproxy.template")
+					templateFile := filepath.Join(env.GetOrDefaultString("CALAOS_HAPROXY_TEMPLATE_PATH", "/etc/haproxy"), "haproxy.template")
 					outFile := filepath.Join(env.GetOrDefaultString("CALAOS_HAPROXY_PATH", "/etc/haproxy"), "haproxy.cfg")
 					err = haproxy.RenderConfig(outFile, templateFile, haconf)
 					if err != nil {