From 2d188fd37f1d571f7315075b4be6538c8a125caf Mon Sep 17 00:00:00 2001
From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Wed, 1 Jan 2020 23:56:28 +0100
Subject: [PATCH] apache: add simple init script

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>
---
 net/apache/Makefile          | 14 +-------------
 net/apache/files/apache.init | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 net/apache/files/apache.init

diff --git a/net/apache/Makefile b/net/apache/Makefile
index 908b7a67cf..bd8a396232 100644
--- a/net/apache/Makefile
+++ b/net/apache/Makefile
@@ -105,6 +105,7 @@ define Package/apache/conffiles
 /etc/apache2/extra/proxy-html.conf
 /etc/apache2/magic
 /etc/apache2/mime.types
+/etc/init.d/apache
 endef
 
 define Package/apache-ab
@@ -296,12 +297,6 @@ define Build/InstallDev
 		$(1)/usr/share
 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
 	$(INSTALL_DIR) $(1)/etc/apache2/extra
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/apache2/extra/* \
@@ -330,13 +325,6 @@ define Package/apache/install
 							$(1)/usr/sbin
 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
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ab $(1)/usr/bin
diff --git a/net/apache/files/apache.init b/net/apache/files/apache.init
new file mode 100644
index 0000000000..a0136c8411
--- /dev/null
+++ b/net/apache/files/apache.init
@@ -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
+}
-- 
2.30.2