From b031b254878ad94f91c1724cac2b2b5e800961f7 Mon Sep 17 00:00:00 2001
From: "Adam T. Carpenter" <atc@53hor.net>
Date: Tue, 9 Feb 2021 16:37:27 -0500
Subject: fixed dichroism startup

---
 Bastillefile                 | 10 +++++-----
 usr/local/etc/rc.d/dichroism | 11 ++++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Bastillefile b/Bastillefile
index 168855a..963681f 100644
--- a/Bastillefile
+++ b/Bastillefile
@@ -8,8 +8,8 @@ FSTAB /zroot/theglassyladies /var/db/theglassyladies nullfs rw 0 0
 PKG nginx yarn sqlite3 rust
 
 # Download sources
-fetch -o /tmp http://192.168.1.50:3000/53hornet/theglassyladies/archive/master.tar.gz
-CMD tar -xzvf /tmp/build/master.tar.gz -C /tmp/build
+CMD fetch -o /tmp http://git.53hor.net/53hornet/theglassyladies/archive/master.tar.gz
+CMD tar -xzvf /tmp/master.tar.gz -C /tmp/build
 
 # Build backend
 CMD CARGO_HOME=/tmp/build SQLITE3_LIB_DIR=/usr/local/lib SQLITE3_INCLUDE_DIR=/usr/local/include cargo install --root /usr/local --path /tmp/build/theglassyladies/dichroism
@@ -24,9 +24,9 @@ OVERLAY usr
 CMD chmod +x /usr/local/etc/rc.d/dichroism
 
 # Cleanup
-#CMD rm -rf /tmp/build
-#CMD pkg remove -y yarn rust
-#CMD pkg autoremove -y
+CMD rm -rf /tmp/build
+CMD pkg remove -y yarn rust
+CMD pkg autoremove -y
 
 # Launch
 SYSRC nginx_enable=YES
diff --git a/usr/local/etc/rc.d/dichroism b/usr/local/etc/rc.d/dichroism
index fba6f7c..8b69d09 100644
--- a/usr/local/etc/rc.d/dichroism
+++ b/usr/local/etc/rc.d/dichroism
@@ -3,9 +3,14 @@
 . /etc/rc.subr
 
 name="dichroism"
+title="Dichroism"
 rcvar="${name}_enable"
-command="/usr/local/bin/${name}"
-start_cmd="cd /var/db/theglassyladies; ${command}"
-load_rc_config $name
+pidfile="/var/run/${name}.pid"
+exec_path="/usr/local/bin/${name}"
+output_file="/var/log/${name}.log"
+command="/usr/sbin/daemon"
+command_args="-r -t ${title} -o ${output_file} -P ${pidfile} ${exec_path}"
+dichroism_chdir="/var/db/theglassyladies"
+load_rc_config ${name}
 run_rc_command "$1"
 
-- 
cgit v1.2.3