From a9341227068996fdbde2bd4da92ee491e8bfbeea Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Wed, 4 Sep 2013 17:37:53 +0100
Subject: Use lighttpd for the trove http services.

- Add a configuration file to lighttpd. The max-procs for the
  read-only cache server is bigger than the writable cache server,
  as is expected to have a bigger load. Although the max-procs set
  is low, each fastcgi process supports multiple connections, that
  accordingly flup source code is equal to the maximum number of
  open file descriptors that a process can have.

- Remove morph-cache-server systemd units. The servers will be
  spawned by lighttpd as fcgi processes.

- Make cgit to be served by lighttpd instead of busybox httpd.
---
 units/http-daemon.service                        | 7 -------
 units/lighttpd.service                           | 7 +++++++
 units/morph-cache-server-write-interface.service | 7 -------
 units/morph-cache-server.service                 | 7 -------
 4 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 units/http-daemon.service
 create mode 100644 units/lighttpd.service
 delete mode 100644 units/morph-cache-server-write-interface.service
 delete mode 100644 units/morph-cache-server.service

(limited to 'units')

diff --git a/units/http-daemon.service b/units/http-daemon.service
deleted file mode 100644
index bd08f04..0000000
--- a/units/http-daemon.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=HTTP Daemon for Trove
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/httpd -u git:git -h /var/www/htdocs -f
-Restart=always
diff --git a/units/lighttpd.service b/units/lighttpd.service
new file mode 100644
index 0000000..589a595
--- /dev/null
+++ b/units/lighttpd.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Lighttpd Web Server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/lighttpd -f /etc/lighttpd.conf -D
+Restart=always
diff --git a/units/morph-cache-server-write-interface.service b/units/morph-cache-server-write-interface.service
deleted file mode 100644
index 684a040..0000000
--- a/units/morph-cache-server-write-interface.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Morph cache server (write interface)
-After=network.target
-
-[Service]
-ExecStart=/bin/su -c '/usr/bin/morph-cache-server --config=/etc/morph-cache-server-write.conf' - cache
-Restart=always
diff --git a/units/morph-cache-server.service b/units/morph-cache-server.service
deleted file mode 100644
index f1f2385..0000000
--- a/units/morph-cache-server.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Morph cache server
-After=network.target
-
-[Service]
-ExecStart=/bin/su -c /usr/bin/morph-cache-server - cache
-Restart=always
-- 
cgit v1.2.1