Commit fa36ccd2 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

lighttpd: install init script and config file unconditionally 



As discussed, users should use a rootfs overlay or a post-build script
instead of a custom skeleton to override files installed by Buildroot,
so there is no point in having conditions when installing init scripts
or configuration files.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent febe876d

package/lighttpd/lighttpd.mk

+16 −30
Original line number Diff line number Diff line
@@ -62,28 +62,16 @@ endif 
define LIGHTTPD_INSTALL_CONFIG

	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d

	$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www



	[ -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] || \

	$(INSTALL) -D -m 755 $(@D)/doc/config/lighttpd.conf \

		$(TARGET_DIR)/etc/lighttpd/lighttpd.conf



	[ -f $(TARGET_DIR)/etc/lighttpd/modules.conf ] || \

	$(INSTALL) -D -m 755 $(@D)/doc/config/modules.conf \

		$(TARGET_DIR)/etc/lighttpd/modules.conf



	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf ] || \

	$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/access_log.conf \

		$(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf



	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf ] || \

	$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/debug.conf \

		$(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf



	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf ] || \

	$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/dirlisting.conf \

		$(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf



	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf ] || \

	$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/mime.conf \

		$(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf

endef
@@ -91,13 +79,11 @@ endef 
LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG



define LIGHTTPD_INSTALL_INIT_SYSV

	[ -f $(TARGET_DIR)/etc/init.d/S50lighttpd ] || \

	$(INSTALL) -D -m 755 package/lighttpd/S50lighttpd \

		$(TARGET_DIR)/etc/init.d/S50lighttpd

endef



define LIGHTTPD_INSTALL_INIT_SYSTEMD

	[ -f $(TARGET_DIR)/etc/systemd/system/lighttpd.service ] || \

	$(INSTALL) -D -m 644 package/lighttpd/lighttpd.service \

		$(TARGET_DIR)/etc/systemd/system/lighttpd.service