623ae46141
This is a squash of the following cherry-picked commits:14f4f0bef04e6bdd8a49c8aba5113b2d188fd37f31e0d618e539e68309e8a1472254dbd6476f30bb258967b0d2e94a08298e6bd63d24f066bb68a7b6d44ad09fcdShort 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>
11 lines
352 B
Diff
11 lines
352 B
Diff
--- a/include/scoreboard.h
|
|
+++ b/include/scoreboard.h
|
|
@@ -40,7 +40,7 @@ extern "C" {
|
|
|
|
/* Scoreboard file, if there is one */
|
|
#ifndef DEFAULT_SCOREBOARD
|
|
-#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
|
|
+#define DEFAULT_SCOREBOARD "log/apache2/apache_runtime_status"
|
|
#endif
|
|
|
|
/* Scoreboard info on a process is, for now, kept very brief ---
|