From 71913dca28579d6925ce12ba2f1c1b890c0817d1f3fbad896ed582f8fc484dab Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Mon, 18 May 2015 11:49:49 +0000 Subject: [PATCH] Accepting request 307739 from home:guohouzuo:freeipa In previous submission I incorrectly removed the entire line "Include ...mod_nss.d/*.conf". OBS-URL: https://build.opensuse.org/request/show/307739 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_nss?expand=0&rev=10 --- apache2-mod_nss.changes | 6 ++++++ mod_nss.conf.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apache2-mod_nss.changes b/apache2-mod_nss.changes index 568a921..fb5431c 100644 --- a/apache2-mod_nss.changes +++ b/apache2-mod_nss.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 18 10:32:12 UTC 2015 - hguo@suse.com + +- The package does not carry any .conf files underneath /etc/apache2/mod_nss.d, + therefore use 'IncludeOptional' instead of 'Include' directory in mod_nss.conf. + ------------------------------------------------------------------- Thu May 7 12:27:40 UTC 2015 - kstreitova@suse.com diff --git a/mod_nss.conf.in b/mod_nss.conf.in index c37e04a..3a953da 100644 --- a/mod_nss.conf.in +++ b/mod_nss.conf.in @@ -106,7 +106,7 @@ Include /etc/apache2/listen_nss.conf -Include /etc/apache2/mod_nss.d/*.conf +IncludeOptional /etc/apache2/mod_nss.d/*.conf