summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2013-09-12 16:05:56 +0100
committerTiago Gomes <tiago.gomes@codethink.co.uk>2013-09-12 16:05:56 +0100
commitaeade5c991ca1a88e01c6bcd23592081d5e68305 (patch)
treefdf2ce5a7021732fddbb36391b57c7c365d8852d /units
parent5dca26febbd2f1938f8bb1fab4d53fcacdf1d0e8 (diff)
parenta9341227068996fdbde2bd4da92ee491e8bfbeea (diff)
downloadtrove-setup-aeade5c991ca1a88e01c6bcd23592081d5e68305.tar.gz
Merge branch 'baserock/tiagogomes/lighttpd'
Reviewed by Pedro Alvarez Daniel Silverstone
Diffstat (limited to 'units')
-rw-r--r--units/http-daemon.service7
-rw-r--r--units/lighttpd.service7
-rw-r--r--units/morph-cache-server-write-interface.service7
-rw-r--r--units/morph-cache-server.service7
4 files changed, 7 insertions, 21 deletions
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