From 07cd6d3e508fa6a93536d716659488f38018abe9 Mon Sep 17 00:00:00 2001
From: davidnewhall2 <david@sleepers.pro>
Date: Sat, 1 Feb 2020 03:35:00 -0800
Subject: [PATCH] fixes

---
 Makefile                 |  4 ++--
 init/bsd/README.md       |  9 +++++++++
 init/bsd/template.rc.d   | 31 +++++++++++++++++++++++++++++++
 init/bsd/unifi-poller.rc | 35 -----------------------------------
 4 files changed, 42 insertions(+), 37 deletions(-)
 create mode 100644 init/bsd/README.md
 create mode 100755 init/bsd/template.rc.d
 delete mode 100755 init/bsd/unifi-poller.rc

diff --git a/Makefile b/Makefile
index 8f921711..34cbc8ed 100644
--- a/Makefile
+++ b/Makefile
@@ -260,8 +260,8 @@ package_build_freebsd: readme man freebsd
 	[ "$(FORMULA)" != "service" ] || mkdir -p $@/usr/local/etc/rc.d
 	[ "$(FORMULA)" != "service" ] || \
 			sed -e "s/{{BINARY}}/$(BINARY)/g" -e "s/{{BINARYU}}/$(BINARYU)/g" -e "s/{{CONFIG_FILE}}/$(CONFIG_FILE)/g" \
-			init/bsd/unifi-poller.rc > $@/usr/local/etc/rc.d/unifi-poller
-	[ "$(FORMULA)" != "service" ] || chmod +x $@/usr/local/etc/rc.d/unifi-poller
+			init/bsd/template.rc.d > $@/usr/local/etc/rc.d/$(BINARY)
+	[ "$(FORMULA)" != "service" ] || chmod +x $@/usr/local/etc/rc.d/$(BINARY)
 
 package_build_freebsd_386: package_build_freebsd freebsd386
 	mkdir -p $@
diff --git a/init/bsd/README.md b/init/bsd/README.md
new file mode 100644
index 00000000..98cb4145
--- /dev/null
+++ b/init/bsd/README.md
@@ -0,0 +1,9 @@
+Generic FreeBSD rc.d service file lives here.
+
+-   Marshal template like so (example in [Makefile](../../Makefile)):
+```shell
+    sed -e "s/{{BINARY}}/app-name/g" \
+        -e "s/{{BINARYU}}/app_name/g" \
+        -e "s/{{CONFIG_FILE}}/app-name.conf/g" \
+        template.rc.d > /usr/local/etc/rc.d/app-name
+```
diff --git a/init/bsd/template.rc.d b/init/bsd/template.rc.d
new file mode 100755
index 00000000..64b587f3
--- /dev/null
+++ b/init/bsd/template.rc.d
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# FreeBSD rc.d startup script for {{BINARY}}.
+#
+# PROVIDE: {{BINARY}}
+# REQUIRE: networking syslog
+# KEYWORD:
+
+. /etc/rc.subr
+
+name="{{BINARYU}}"
+real_name="{{BINARY}}"
+rcvar="{{BINARYU}}_enable"
+{{BINARYU}}_command="/usr/local/bin/${real_name}"
+{{BINARYU}}_user="nobody"
+{{BINARYU}}_config="/usr/local/etc/${real_name}/{{CONFIG_FILE}}"
+pidfile="/var/run/${real_name}/pid"
+
+# This runs `daemon` as the `{{BINARYU}}_user` user.
+command="/usr/sbin/daemon"
+command_args="-P ${pidfile} -r -t ${real_name} -T ${real_name} -l daemon ${{{BINARYU}}_command} -c ${{{BINARYU}}_config}"
+
+load_rc_config ${name}
+: ${{{BINARYU}}_enable:=no}
+
+# Make a place for the pid file.
+mkdir -p $(dirname ${pidfile})
+chown -R ${{BINARYU}}_user $(dirname ${pidfile})
+
+# Go!
+run_rc_command "$1"
diff --git a/init/bsd/unifi-poller.rc b/init/bsd/unifi-poller.rc
deleted file mode 100755
index 72405718..00000000
--- a/init/bsd/unifi-poller.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# FreeBSD rc.d startup script for unifi-poller.
-# Target like so:
-#   sed -e "s/{{BINARY}}/app-name/g"
-#     -e "s/{{BINARYU}}/app_name/g" \
-#     -e "s/{{CONFIG_FILE}}/app-name.conf/g" \
-#     thisfile.rc > /usr/local/etc/rc.d/app-name
-#
-# PROVIDE: {{BINARY}}
-# REQUIRE: networking syslog
-# KEYWORD:
-
-. /etc/rc.subr
-
-name="{{BINARYU}}"
-rcvar="{{BINARYU}}_enable"
-{{BINARYU}}_command="/usr/local/bin/{{BINARY}}"
-{{BINARYU}}_user="nobody"
-{{BINARYU}}_config="/usr/local/etc/{{BINARY}}/{{CONFIG_FILE}}"
-pidfile="/var/run/{{BINARY}}/pid"
-
-# This runs `daemon` as the `{{BINARYU}}_user` user.
-command="/usr/sbin/daemon"
-command_args="-P ${pidfile} -r -t {{BINARY}} -T {{BINARY}} -l daemon ${{{BINARYU}}_command} -c ${{{BINARYU}}_config}"
-
-load_rc_config ${name}
-: ${{{BINARYU}}_enable:=no}
-
-# Make a place for the pid file.
-mkdir -p $(dirname ${pidfile})
-chown -R ${{BINARYU}}_user $(dirname ${pidfile})
-
-# Go!
-run_rc_command "$1"