summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Bastillefile18
-rw-r--r--usr/local/etc/lighttpd/conf.d/cgi.conf2
-rw-r--r--usr/local/etc/lighttpd/lighttpd.conf7
-rw-r--r--var/cron/tabs/www1
4 files changed, 16 insertions, 12 deletions
diff --git a/Bastillefile b/Bastillefile
index ff36d82..ddba70d 100644
--- a/Bastillefile
+++ b/Bastillefile
@@ -1,10 +1,12 @@
-# Simple web server for my personal site pages
-PKG lighttpd
+# Simple web server for my web site
+
+# Prerequisites
+PKG lighttpd php74
OVERLAY usr
-OVERLAY var
-CMD fetch -o /tmp https://git.53hor.net/53hornet/53hor/archive/master.tar.gz
-CMD tar -C /var -xvf /tmp/master.tar.gz --exclude drafts --exclude Makefile --exclude templates
-CMD mv /tmp/master.tar.gz /tmp/master.tar.gz.bak
+CMD mkdir -p /var/www
+FSTAB /zroot/www/htdocs /var/www nullfs ro 0 0
+
+# Start server
SYSRC lighttpd_enable=YES
-SERVICE lighttpd start
-SERVICE cron restart
+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..cee0470
--- /dev/null
+++ b/usr/local/etc/lighttpd/conf.d/cgi.conf
@@ -0,0 +1,2 @@
+server.modules += ( "mod_cgi" )
+cgi.assign = ( ".php" => "/usr/local/bin/php-cgi" )
diff --git a/usr/local/etc/lighttpd/lighttpd.conf b/usr/local/etc/lighttpd/lighttpd.conf
index 76e8076..c165e62 100644
--- a/usr/local/etc/lighttpd/lighttpd.conf
+++ b/usr/local/etc/lighttpd/lighttpd.conf
@@ -1,11 +1,12 @@
-## Note: use kqueue
var.log_root = "/var/log/lighttpd"
include "conf.d/access_log.conf"
include "conf.d/dirlisting.conf"
include "conf.d/mime.conf"
-index-file.names += ("index.html")
-server.document-root = "/var/53hor"
+include "conf.d/cgi.conf"
+index-file.names += ("index.php")
+server.document-root = "/var/www"
server.errorlog = log_root + "/error.log"
+server.breakagelog = log_root + "/breakage.log"
server.network-backend = "sendfile"
server.port = 80
server.username = "www"
diff --git a/var/cron/tabs/www b/var/cron/tabs/www
deleted file mode 100644
index af41605..0000000
--- a/var/cron/tabs/www
+++ /dev/null
@@ -1 +0,0 @@
-0 */6 * * * fetch -o /tmp -i /tmp/master.tar.gz.bak https://git.53hor.net/53hornet/53hor/archive/master.tar.gz && tar -C /var -xf /tmp/master.tar.gz --exclude drafts --exclude Makefile --exclude templates && mv /tmp/master.tar.gz /tmp/master.tar.gz.bak