This is a squash of the following cherry-picked commits:14f4f0bef0
4e6bdd8a49
c8aba5113b
2d188fd37f
31e0d618e5
39e68309e8
a1472254db
d6476f30bb
258967b0d2
e94a08298e
6bd63d24f0
66bb68a7b6
d44ad09fcd
Short summary: - version is bumped to 2.4.41 - httpd is renamed to apache2 to avoid overwriting of other servers (for instance busybox's httpd) - the name apache2 is now also used for directories, for instance /etc/apache2 instead of /etc/apache - a simple init script it added (/etc/init.d/apache2) - a user "apache" is added upon package installation and used by default - adds the Apache modules (in the main package as well as in additional packages) - Makefile and patches are updated and cleaned - adds myself as maintainer - improves the cross-compile setup (via configure variables, patches & sed scripts) - apxs is fixed up so that external modules can be added easily For more details please check the individual commits provided above. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
13 lines
288 B
Diff
13 lines
288 B
Diff
--- a/docs/conf/httpd.conf.in
|
|
+++ b/docs/conf/httpd.conf.in
|
|
@@ -74,8 +74,8 @@ Listen @@Port@@
|
|
# It is usually good practice to create a dedicated user and group for
|
|
# running httpd, as with most system services.
|
|
#
|
|
-User daemon
|
|
-Group daemon
|
|
+User apache
|
|
+Group apache
|
|
|
|
</IfModule>
|
|
|