updated runtime files, added rc.d script for dichroism

3 files changed, 23 insertions, 8 deletions

diff --git a/Bastillefile b/Bastillefile
index ae3c7a9..9c97a2b 100644
--- a/Bastillefile
+++ b/Bastillefile
@@ -1,3 +1,4 @@
+# TODO: user!
 # Dirs and mounts
 CMD mkdir -p /tmp/build
 CMD mkdir -p /var/db/theglassyladies
@@ -14,18 +15,21 @@ CMD tar -xzvf /tmp/build/master.tar.gz -C /tmp/build
 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
 
 # Build frontend
+CMD cp /var/db/theglassyladies/env.production /tmp/build/theglassyladies/iridescence/.env.production
 CMD cd /tmp/build/theglassyladies/iridescence ; yarn ; yarn build
 CMD mv /tmp/build/theglassyladies/iridescence/dist /var/www
 
 # Config
 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
 SERVICE nginx start
-CMD cd /var/db/theglassyladies ; dichroism >/var/log/dichroism.log &
+SYSRC dichroism_enable=YES
+SERVICE dichroism start
diff --git a/usr/local/etc/nginx/nginx.conf b/usr/local/etc/nginx/nginx.conf
index efef87b..c955077 100644
--- a/usr/local/etc/nginx/nginx.conf
+++ b/usr/local/etc/nginx/nginx.conf
@@ -38,11 +38,11 @@ http {
   
     location /login {
       auth_basic "Glassy Ladies only!";
-      auth_basic_user_file /var/db/theglassyladies/.htpasswd;
+      auth_basic_user_file /var/db/theglassyladies/htpasswd;
     }
   
     location /images/ {
-      root /var/db/gl/images;
+      root /var/db/theglassyladies/images;
       autoindex on;
     }
   
@@ -51,7 +51,7 @@ http {
   
       limit_except GET OPTIONS {
         auth_basic "Glassy Ladies only!";
-        auth_basic_user_file /var/db/theglassyladies/.htpasswd;
+        auth_basic_user_file /var/db/theglassyladies/htpasswd;
       }
     }
   
diff --git a/usr/local/etc/rc.d/dichroism b/usr/local/etc/rc.d/dichroism
new file mode 100644
index 0000000..fba6f7c
--- /dev/null
+++ b/usr/local/etc/rc.d/dichroism
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+. /etc/rc.subr
+
+name="dichroism"
+rcvar="${name}_enable"
+command="/usr/local/bin/${name}"
+start_cmd="cd /var/db/theglassyladies; ${command}"
+load_rc_config $name
+run_rc_command "$1"
+