| Message ID | 20190828021626.9688-2-unixmania@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/thttpd: fix systemd and sysvinit startup | expand |
On Tue, 27 Aug 2019 23:16:25 -0300 unixmania@gmail.com wrote: > From: Carlos Santos <unixmania@gmail.com> > > Create the configuration file as /etc/thttpd.conf, as expected by the > systemd unit file. > > This matches other web server packages that install configuration files > at /etc/lighttpd/, /etc/apache2, etc. > > Signed-off-by: Carlos Santos <unixmania@gmail.com> > --- > package/thttpd/thttpd.mk | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > On Tue, 27 Aug 2019 23:16:25 -0300 > unixmania@gmail.com wrote: >> From: Carlos Santos <unixmania@gmail.com> >> >> Create the configuration file as /etc/thttpd.conf, as expected by the >> systemd unit file. >> >> This matches other web server packages that install configuration files >> at /etc/lighttpd/, /etc/apache2, etc. >> >> Signed-off-by: Carlos Santos <unixmania@gmail.com> >> --- >> package/thttpd/thttpd.mk | 11 ++++++----- >> 1 file changed, 6 insertions(+), 5 deletions(-) > Applied to master, thanks. Committed to 2019.02.x, 2019.05.x and 2019.08.x, thanks.
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index 29611fff2c..03f148eb35 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -18,13 +18,14 @@ define THTTPD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/extras/syslogtocern $(TARGET_DIR)/usr/bin/syslogtocern $(INSTALL) -D -m 0755 $(@D)/scripts/thttpd_wrapper $(TARGET_DIR)/usr/sbin/thttpd_wrapper $(SED) 's:/usr/local/sbin:/usr/sbin:g' -e \ - 's:/usr/local/www:/var/www:g' $(TARGET_DIR)/usr/sbin/thttpd_wrapper + 's:/usr/local/www/thttpd_config:/etc/thttpd.conf:g' \ + $(TARGET_DIR)/usr/sbin/thttpd_wrapper $(INSTALL) -d $(TARGET_DIR)/var/www/data $(INSTALL) -d $(TARGET_DIR)/var/www/logs - echo "dir=/var/www/data" > $(TARGET_DIR)/var/www/thttpd_config - echo 'cgipat=**.cgi' >> $(TARGET_DIR)/var/www/thttpd_config - echo "logfile=/var/www/logs/thttpd_log" >> $(TARGET_DIR)/var/www/thttpd_config - echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)/var/www/thttpd_config + echo "dir=/var/www/data" > $(TARGET_DIR)/etc/thttpd.conf + echo 'cgipat=**.cgi' >> $(TARGET_DIR)/etc/thttpd.conf + echo "logfile=/var/www/logs/thttpd_log" >> $(TARGET_DIR)/etc/thttpd.conf + echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)/etc/thttpd.conf endef define THTTPD_INSTALL_INIT_SYSV