From 508dcff6193ad605e88b828c86d092ec31456311 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 31 Jan 2021 11:57:05 -0500 Subject: updated to include htpasswd --- Bastillefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Bastillefile') diff --git a/Bastillefile b/Bastillefile index fc385b9..ae3c7a9 100644 --- a/Bastillefile +++ b/Bastillefile @@ -1,7 +1,7 @@ # Dirs and mounts CMD mkdir -p /tmp/build -CMD mkdir -p /var/db/gl -FSTAB /zroot/gl /var/db/gl nullfs rw 0 0 +CMD mkdir -p /var/db/theglassyladies +FSTAB /zroot/theglassyladies /var/db/theglassyladies nullfs rw 0 0 # Prereqs PKG nginx yarn sqlite3 rust @@ -20,12 +20,12 @@ CMD mv /tmp/build/theglassyladies/iridescence/dist /var/www # Config OVERLAY usr -# Launch -CMD cd /var/db/gl ; dichroism -SYSRC nginx_enable=YES -SERVICE nginx start - # Cleanup 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 & -- cgit v1.2.3 From 923a0c35ff2cc4bef05f9fc7f029932735a3a78c Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sun, 31 Jan 2021 14:13:33 -0500 Subject: updated runtime files, added rc.d script for dichroism --- Bastillefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Bastillefile') 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 -- cgit v1.2.3