summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb5
-rw-r--r--meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb6
2 files changed, 9 insertions, 2 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb
index f0298b91a..c422092f8 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb
@@ -29,7 +29,10 @@ SRC_URI[sha256sum] = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b63999
29 29
30S = "${WORKDIR}/httpd-${PV}" 30S = "${WORKDIR}/httpd-${PV}"
31 31
32inherit autotools update-rc.d pkgconfig systemd 32inherit autotools update-rc.d pkgconfig systemd update-alternatives
33
34ALTERNATIVE_${PN}-doc = "htpasswd.1"
35ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1"
33 36
34SYSTEMD_SERVICE_${PN} = "apache2.service" 37SYSTEMD_SERVICE_${PN} = "apache2.service"
35SYSTEMD_AUTO_ENABLE_${PN} = "disable" 38SYSTEMD_AUTO_ENABLE_${PN} = "disable"
diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
index 37bd7537d..81815d652 100644
--- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
+++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
@@ -19,7 +19,11 @@ UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz"
19 19
20S = "${WORKDIR}/sthttpd-${PV}" 20S = "${WORKDIR}/sthttpd-${PV}"
21 21
22inherit autotools update-rc.d systemd 22inherit autotools update-rc.d systemd update-alternatives
23
24ALTERNATIVE_PRIORITY = "100"
25ALTERNATIVE_${PN}-doc = "htpasswd.1"
26ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1"
23 27
24SRV_DIR ?= "${servicedir}/www" 28SRV_DIR ?= "${servicedir}/www"
25 29