From c986d663d77ad50c59f3191d49c51cb4da4d3198 Mon Sep 17 00:00:00 2001 From: Mike Williams Date: Fri, 20 Mar 2015 15:13:52 -0400 Subject: [PATCH] lighttpd: use upstream systemd service file Signed-off-by: Mike Williams Signed-off-by: Thomas Petazzoni --- package/lighttpd/lighttpd.mk | 6 +++--- package/lighttpd/lighttpd.service | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 package/lighttpd/lighttpd.service diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 8f34561d21..cdbf91dc4c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -84,12 +84,12 @@ define LIGHTTPD_INSTALL_INIT_SYSV endef define LIGHTTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/lighttpd/lighttpd.service \ - $(TARGET_DIR)/etc/systemd/system/lighttpd.service + $(INSTALL) -D -m 0644 $(@D)/doc/systemd/lighttpd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/lighttpd.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../lighttpd.service \ + ln -fs ../../../../usr/lib/systemd/lighttpd.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service endef diff --git a/package/lighttpd/lighttpd.service b/package/lighttpd/lighttpd.service deleted file mode 100644 index 0ca5357f56..0000000000 --- a/package/lighttpd/lighttpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Lighttpd Web Server -After=network.target - -[Service] -ExecStart=/usr/sbin/lighttpd-angel -f /etc/lighttpd/lighttpd.conf -D -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target -- 2.30.2