Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

apache: add simple init script

Browse source 
Also preinst and postrm are removed. busybox's httpd isn't installed by
default, so these gimmicks seem antiquated.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2020-01-01 23:56:28 +01:00
parent c8aba5113b
commit 2d188fd37f
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/apache/Makefile
View file

@ -105,6 +105,7 @@ define Package/apache/conffiles
/etc/apache2/extra/proxy-html.conf /etc/apache2/extra/proxy-html.conf
/etc/apache2/magic /etc/apache2/magic
/etc/apache2/mime.types /etc/apache2/mime.types
/etc/init.d/apache
endef endef
define Package/apache-ab define Package/apache-ab
@ -296,12 +297,6 @@ define Build/InstallDev
$(1)/usr/share $(1)/usr/share
endef endef
define Package/apache/preinst
rm /usr/sbin/httpd
echo -e "You should take a look in the initscripts, busybox's httpd \n\
uses some parameters which are maybe unsupported by apache."
endef
define Package/apache/install define Package/apache/install
$(INSTALL_DIR) $(1)/etc/apache2/extra $(INSTALL_DIR) $(1)/etc/apache2/extra
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/apache2/extra/* \ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/apache2/extra/* \
@ -330,13 +325,6 @@ define Package/apache/install
$(1)/usr/sbin $(1)/usr/sbin
endef endef
define Package/apache/postrm
rm -rf /usr/sbin/httpd
ln -s /bin/busybox /usr/sbin/httpd
echo -e "You may need to change your initscripts back for the use \n\
with busybox's httpd."
endef
define Package/apache-ab/install define Package/apache-ab/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ab $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ab $(1)/usr/bin

20
net/apache/files/apache.init Normal file
View file

@ -0,0 +1,20 @@
#!/bin/sh /etc/rc.common
START=99
reload() {
apachectl -k restart
}
restart() {
apachectl -k restart
}
start() {
mkdir -p /var/log/apache2 /var/run/apache2
apachectl -k start
}
stop() {
apachectl -k stop
}