[oe-commits] [meta-openembedded] 27/69: apache2: include .load files in modules.d

[git at git.openembedded.org]

martin_jansa pushed a commit to branch morty-next
in repository meta-openembedded.

commit dcfb51300dad5b49b2c0a96c12b17fff2c445f92
Author: Junxian.Xiao <Junxian.Xiao at windriver.com>
AuthorDate: Thu Nov 10 10:31:42 2016 +0800

    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 at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    (cherry picked from commit b2409021dd8a3cb7eac8c8ff21d99cbfca6c07c2)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb | 1 +
 1 file changed, 1 insertion(+)

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 be24998..96f21dd 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.