From 5154120849a68db184648da7034e5c5ce27ea04c Mon Sep 17 00:00:00 2001
From: "Adam T. Carpenter" <atc@53hor.net>
Date: Sat, 3 Jul 2021 10:48:05 -0400
Subject: added CGI module, updated to pull new site and depends

---
 Bastillefile                           | 12 +++++-------
 usr/local/etc/lighttpd/conf.d/cgi.conf |  2 ++
 usr/local/etc/lighttpd/lighttpd.conf   |  7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 usr/local/etc/lighttpd/conf.d/cgi.conf

diff --git a/Bastillefile b/Bastillefile
index 7c44cf0..ddc5e5b 100644
--- a/Bastillefile
+++ b/Bastillefile
@@ -1,16 +1,14 @@
 # Prerequisites
-FSTAB /zroot/carpentertutoring /var/carpentertutoring nullfs ro 0 0
 PKG lighttpd php74 php74-filter php74-openssl
 OVERLAY usr
+CMD mkdir -p /var/www/PHPMailer /var/carpentertutoring 
+FSTAB /zroot/carpentertutoring /var/carpentertutoring nullfs ro 0 0
 
 # Install site to web root
-CMD mkdir -p /var/www && echo Created /var/www
-CMD fetch -o /tmp/master.tar.gz http://git.53hor.net/53hornet/carpentertutoring/archive/master.tar.gz 
-CMD fetch -o /tmp/phpmailer.zip https://github.com/PHPMailer/PHPMailer/archive/master.zip
-CMD tar -xzvf /tmp/master.tar.gz -C /var/www
-CMD tar -xzvf /tmp/phpmailer.zip -C /var/www
+CMD fetch -o - http://git.53hor.net/53hornet/carpentertutoring/archive/master.tar.gz | tar --cd /var/www --strip-components 1 --extract --file -
+CMD fetch -o - https://github.com/PHPMailer/PHPMailer/archive/master.zip | tar --cd /var/www/PHPMailer --strip-components 1 --extract --file -
 
 # Start server
 SYSRC lighttpd_enable=YES
-SERVICE lighttpd start
+SERVICE lighttpd restart
 
diff --git a/usr/local/etc/lighttpd/conf.d/cgi.conf b/usr/local/etc/lighttpd/conf.d/cgi.conf
new file mode 100644
index 0000000..8cc92db
--- /dev/null
+++ b/usr/local/etc/lighttpd/conf.d/cgi.conf
@@ -0,0 +1,2 @@
+server.modules += ( "mod_cgi" )
+cgi.assign = ( ".php" => "" )
diff --git a/usr/local/etc/lighttpd/lighttpd.conf b/usr/local/etc/lighttpd/lighttpd.conf
index c965f3f..0746ae6 100644
--- a/usr/local/etc/lighttpd/lighttpd.conf
+++ b/usr/local/etc/lighttpd/lighttpd.conf
@@ -1,11 +1,12 @@
-# TODO: use kqueue
 var.log_root = "/var/log/lighttpd"
 include "conf.d/access_log.conf"
 include "conf.d/mime.conf"
-index-file.names += ("index.html")
+include "conf.d/cgi.conf"
+index-file.names += ("index.php")
+server.breakagelog = log_root + "/breakage.log"
 server.document-root = "/var/www"
 server.errorlog = log_root + "/error.log"
+server.groupname = "www"
 server.network-backend = "sendfile"
 server.port = 80
 server.username	= "www"
-server.groupname = "www"
-- 
cgit v1.2.3