diff options
| author |   Junxian.Xiao <Junxian.Xiao@windriver.com> | 2016-11-10 10:31:42 +0800 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2016-11-29 08:22:22 -0800 |
| commit | dcfb51300dad5b49b2c0a96c12b17fff2c445f92 (patch) | |
| tree | 48b6a395a8c516fbc0c369b0072cccbfb39a3c16 /meta-webserver | |
| parent | 0ec9cb2c5e9dd35a7eedff8fd220c3d5ac28a5f2 (diff) | |
| download | meta-openembedded-contrib-dcfb51300dad5b49b2c0a96c12b17fff2c445f92.tar.gz | |
apache2: include .load files in modules.d
According to other Linux distributes like Ubuntu, the modules
are usually included by 'LoadModule' command in *.load files
in mods-enable directory, as *.conf files in this directory
are usually used for special configurations for each module.
Include *.load in apache2 top conf file to be compatible with
customer's normal usage habits.
Signed-off-by: Junxian.Xiao <Junxian.Xiao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit b2409021dd8a3cb7eac8c8ff21d99cbfca6c07c2)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-webserver')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb index be24998d16..96f21dde43 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb @@ -80,6 +80,7 @@ do_install_append() { # Ensure configuration file pulls in conf.d and modules.d printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf # match with that is in init script printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf |