[packages/apache/feat/conf-modules: 20/26] update files with conf.d vs conf.modules.d packaging

glen glen at pld-linux.org
Sat May 2 21:42:22 CEST 2015


commit 2f62cc2c78a6aaf9e6e0bb3101cdfa0e7ac103b0
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat May 2 14:41:55 2015 +0300

    update files with conf.d vs conf.modules.d packaging

 apache.spec | 265 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 135 insertions(+), 130 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index e3af4e1..aaa88ce 100644
--- a/apache.spec
+++ b/apache.spec
@@ -2777,32 +2777,38 @@ cp -p %{SOURCE30} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 
-CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d"
-cp -p %{SOURCE7} $CFG/common.conf
-cp -p %{SOURCE23} $CFG/mod_mime.conf
-cp -p %{SOURCE24} $CFG/mod_authz_host.conf
-cp -p %{SOURCE25} $CFG/mod_cgid.conf
-cp -p %{SOURCE26} $CFG/mod_log_config.conf
-cp -p %{SOURCE27} $CFG/mod_mime_magic.conf
-cp -p %{SOURCE28} $CFG/mod_cache.conf
-cp -p %{SOURCE8} $CFG/mod_vhost_alias.conf
-cp -p %{SOURCE9} $CFG/mod_status.conf
-cp -p %{SOURCE10} $CFG/mod_proxy.conf
-cp -p %{SOURCE11} $CFG/mod_info.conf
-cp -p %{SOURCE12} $CFG/mod_ssl.conf
-cp -p %{SOURCE13} $CFG/mod_dav.conf
-cp -p %{SOURCE14} $CFG/mod_dir.conf
-cp -p %{SOURCE15} $CFG/mod_suexec.conf
-cp -p %{SOURCE16} $CFG/mod_deflate.conf
-cp -p %{SOURCE17} $CFG/mod_autoindex.conf
-cp -p %{SOURCE18} $CFG/errordocs.conf
-cp -p %{SOURCE19} $CFG/manual.conf
-cp -p %{SOURCE20} $CFG/mod_userdir.conf
-cp -p %{SOURCE21} $CFG/mpm.conf
-cp -p %{SOURCE22} $CFG/languages.conf
+# There are two dirs loading configuration for modules:
+# - /etc/httpd/conf.modules.d - configs with LoadModule directive
+# - /etc/httpd/conf.d - actual configuration for the modules
+# Files are processed in alphabetical order in both dirs.
+
+CONFD=$RPM_BUILD_ROOT%{_sysconfdir}/conf.d
+CONFD_MODULES=$RPM_BUILD_ROOT%{_sysconfdir}/conf.modules.d
+
+cp -p %{SOURCE7}  $CONFD/common.conf
+cp -p %{SOURCE23} $CONFD/mod_mime.conf
+cp -p %{SOURCE24} $CONFD/mod_authz_host.conf
+cp -p %{SOURCE25} $CONFD/mod_cgid.conf
+cp -p %{SOURCE26} $CONFD/mod_log_config.conf
+cp -p %{SOURCE27} $CONFD/mod_mime_magic.conf
+cp -p %{SOURCE28} $CONFD/mod_cache.conf
+cp -p %{SOURCE8}  $CONFD/mod_vhost_alias.conf
+cp -p %{SOURCE9}  $CONFD/mod_status.conf
+cp -p %{SOURCE10} $CONFD/mod_proxy.conf
+cp -p %{SOURCE11} $CONFD/mod_info.conf
+cp -p %{SOURCE12} $CONFD/mod_ssl.conf
+cp -p %{SOURCE13} $CONFD/mod_dav.conf
+cp -p %{SOURCE14} $CONFD/mod_dir.conf
+cp -p %{SOURCE15} $CONFD/mod_suexec.conf
+cp -p %{SOURCE16} $CONFD/mod_deflate.conf
+cp -p %{SOURCE17} $CONFD/mod_autoindex.conf
+cp -p %{SOURCE18} $CONFD/errordocs.conf
+cp -p %{SOURCE19} $CONFD/manual.conf
+cp -p %{SOURCE20} $CONFD/mod_userdir.conf
+cp -p %{SOURCE21} $CONFD/mpm.conf
+cp -p %{SOURCE22} $CONFD/languages.conf
 cp -p %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
 
-CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.modules.d"
 for module in access_compat actions alias allowmethods asis auth_basic \
 	auth_digest auth_form authn_anon authn_core authn_dbd authn_dbm \
 	authn_file authn_socache authnz_ldap authz_core authz_dbd \
@@ -2823,11 +2829,9 @@ for module in access_compat actions alias allowmethods asis auth_basic \
 	socache_shmcb speling substitute \
 	unique_id usertrack version watchdog xml2enc; do
 
-	echo "LoadModule ${module}_module	modules/mod_$module.so" > $CFG/mod_$module.conf
+	echo "LoadModule ${module}_module	modules/mod_$module.so" > $CONFD_MODULES/00_mod_$module.conf
 done
 
-CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d"
-
 # anything in style dir not ending with .css is trash
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
 find $RPM_BUILD_ROOT%{_datadir}/manual/style -type f ! -name '*.css' -print0 | xargs -0r rm -f
@@ -2849,7 +2853,7 @@ ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
 mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/apxs
 
 # cgi_test: create config file with ScriptAlias
-cat << 'EOF' > $CFG/09_cgi_test.conf
+cat << 'EOF' > $CONFD/cgi_test.conf
 ScriptAlias /cgi-bin/printenv %{_cgibindir}/printenv
 ScriptAlias /cgi-bin/test-cgi %{_cgibindir}/test-cgi
 EOF
@@ -3131,11 +3135,12 @@ fi
 %{_sysconfdir}/run
 %{_sysconfdir}/logs
 %attr(750,root,root) %dir %{_sysconfdir}/conf.d
+%attr(750,root,root) %dir %{_sysconfdir}/conf.modules.d
 %attr(750,root,root) %dir %{_sysconfdir}/vhosts.d
 %attr(750,root,root) %dir %{_sysconfdir}/webapps.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mpm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/common.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mpm.conf
 %attr(640,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/vhosts.d/example.net.conf
 %attr(640,root,root) %{_sysconfdir}/magic
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd
@@ -3173,11 +3178,11 @@ fi
 
 %files doc -f manual.files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_manual.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/manual.conf
 
 %files errordocs
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_errordocs.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/errordocs.conf
 %{_datadir}/error
 
 %files suexec
@@ -3185,7 +3190,7 @@ fi
 %attr(4755,root,root) %{_sbindir}/suexec
 %attr(755,root,root) %{_sbindir}/suexec.fcgi
 %attr(755,root,root) %{_libexecdir}/mod_suexec.so
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_suexec.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_suexec.conf
 %{_mandir}/man8/suexec.8*
 
 %files index
@@ -3219,27 +3224,27 @@ fi
 
 %files mod_access_compat
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_access_compat.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_access_compat.conf
 %attr(755,root,root) %{_libexecdir}/mod_access_compat.so
 
 %files mod_actions
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_actions.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_actions.conf
 %attr(755,root,root) %{_libexecdir}/mod_actions.so
 
 %files mod_alias
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_alias.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_alias.conf
 %attr(755,root,root) %{_libexecdir}/mod_alias.so
 
 %files mod_allowmethods
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_allowmethods.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_allowmethods.conf
 %attr(755,root,root) %{_libexecdir}/mod_allowmethods.so
 
 %files mod_asis
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_asis.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_asis.conf
 %attr(755,root,root) %{_libexecdir}/mod_asis.so
 
 %files mod_auth
@@ -3247,7 +3252,7 @@ fi
 
 %files mod_auth_basic
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_auth_basic.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_auth_basic.conf
 %attr(755,root,root) %{_libexecdir}/mod_auth_basic.so
 
 %files mod_auth_dbm
@@ -3255,106 +3260,106 @@ fi
 
 %files mod_auth_digest
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_auth_digest.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_auth_digest.conf
 %attr(755,root,root) %{_libexecdir}/mod_auth_digest.so
 
 %files mod_auth_form
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_auth_form.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_auth_form.conf
 %attr(755,root,root) %{_libexecdir}/mod_auth_form.so
 
 %files mod_authn_core
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_core.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authn_core.conf
 %attr(755,root,root) %{_libexecdir}/mod_authn_core.so
 
 %files mod_authn_anon
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_anon.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authn_anon.conf
 %attr(755,root,root) %{_libexecdir}/mod_authn_anon.so
 
 %files mod_authn_dbd
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_dbd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authn_dbd.conf
 %attr(755,root,root) %{_libexecdir}/mod_authn_dbd.so
 
 %files mod_authn_dbm
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_dbm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authn_dbm.conf
 %attr(755,root,root) %{_libexecdir}/mod_authn_dbm.so
 
 %files mod_authn_file
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_file.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authn_file.conf
 %attr(755,root,root) %{_libexecdir}/mod_authn_file.so
 
 %files mod_authn_socache
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_socache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authn_socache.conf
 %attr(755,root,root) %{_libexecdir}/mod_authn_socache.so
 
 %if %{with ldap}
 %files mod_authnz_ldap
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authnz_ldap.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authnz_ldap.conf
 %attr(755,root,root) %{_libexecdir}/mod_authnz_ldap.so
 %endif
 
 %files mod_authz_core
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_core.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authz_core.conf
 %attr(755,root,root) %{_libexecdir}/mod_authz_core.so
 
 %files mod_authz_dbd
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_dbd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authz_dbd.conf
 %attr(755,root,root) %{_libexecdir}/mod_authz_dbd.so
 
 %files mod_authz_dbm
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_dbm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authz_dbm.conf
 %attr(755,root,root) %{_libexecdir}/mod_authz_dbm.so
 
 %files mod_authz_groupfile
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_groupfile.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authz_groupfile.conf
 %attr(755,root,root) %{_libexecdir}/mod_authz_groupfile.so
 
 %files mod_authz_host
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_host.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_authz_host.conf
 %attr(755,root,root) %{_libexecdir}/mod_authz_host.so
 
 %files mod_authz_owner
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_owner.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authz_owner.conf
 %attr(755,root,root) %{_libexecdir}/mod_authz_owner.so
 
 %files mod_authz_user
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_user.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_authz_user.conf
 %attr(755,root,root) %{_libexecdir}/mod_authz_user.so
 
 %files mod_autoindex
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_autoindex.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_autoindex.conf
 %attr(755,root,root) %{_libexecdir}/mod_autoindex.so
 
 %if %{with bucketeer}
 %files mod_bucketeer
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_bucketeer.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_bucketeer.conf
 %attr(755,root,root) %{_libexecdir}/mod_bucketeer.so
 %endif
 
 %files mod_buffer
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_buffer.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_buffer.conf
 %attr(755,root,root) %{_libexecdir}/mod_buffer.so
 
 %files mod_cache
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_cache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_cache.conf
 %attr(755,root,root) %{_sbindir}/htcacheclean
 %attr(755,root,root) %{_libexecdir}/mod_cache.so
 %attr(755,root,root) %{_libexecdir}/mod_cache_disk.so
@@ -3363,212 +3368,212 @@ fi
 
 %files mod_case_filter
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_case_filter.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_case_filter.conf
 %attr(755,root,root) %{_libexecdir}/mod_case_filter.so
 
 %files mod_case_filter_in
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_case_filter_in.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_case_filter_in.conf
 %attr(755,root,root) %{_libexecdir}/mod_case_filter_in.so
 
 %files mod_cern_meta
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_cern_meta.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_cern_meta.conf
 %attr(755,root,root) %{_libexecdir}/mod_cern_meta.so
 
 %files mod_cgi
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_cgi.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_cgi.conf
 %attr(755,root,root) %{_libexecdir}/mod_cgi.so
 
 %files mod_cgid
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_cgid.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_cgid.conf
 %attr(755,root,root) %{_libexecdir}/mod_cgid.so
 
 %files mod_charset_lite
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_charset_lite.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_charset_lite.conf
 %attr(755,root,root) %{_libexecdir}/mod_charset_lite.so
 
 %files mod_data
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_data.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_data.conf
 %attr(755,root,root) %{_libexecdir}/mod_data.so
 
 %files mod_dav
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_dav.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_dav.conf
 %attr(755,root,root) %{_libexecdir}/mod_dav*.so
 %dir %attr(770,root,http) /var/lock/mod_dav
 
 %files mod_dbd
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_dbd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_dbd.conf
 %attr(755,root,root) %{_libexecdir}/mod_dbd.so
 
 %files mod_deflate
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_deflate.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_deflate.conf
 %attr(755,root,root) %{_libexecdir}/mod_deflate.so
 
 %files mod_dialup
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_dialup.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_dialup.conf
 %attr(755,root,root) %{_libexecdir}/mod_dialup.so
 
 %files mod_dir
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_dir.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_dir.conf
 %attr(755,root,root) %{_libexecdir}/mod_dir.so
 
 %files mod_dumpio
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_dumpio.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_dumpio.conf
 %attr(755,root,root) %{_libexecdir}/mod_dumpio.so
 
 %files mod_echo
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_echo.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_echo.conf
 %attr(755,root,root) %{_libexecdir}/mod_echo.so
 
 %files mod_env
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_env.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_env.conf
 %attr(755,root,root) %{_libexecdir}/mod_env.so
 
 %files mod_expires
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_expires.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_expires.conf
 %attr(755,root,root) %{_libexecdir}/mod_expires.so
 
 %files mod_ext_filter
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_ext_filter.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_ext_filter.conf
 %attr(755,root,root) %{_libexecdir}/mod_ext_filter.so
 
 %files mod_file_cache
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_file_cache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_file_cache.conf
 %attr(755,root,root) %{_libexecdir}/mod_file_cache.so
 
 %files mod_filter
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_filter.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_filter.conf
 %attr(755,root,root) %{_libexecdir}/mod_filter.so
 
 %files mod_headers
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_headers.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_headers.conf
 %attr(755,root,root) %{_libexecdir}/mod_headers.so
 
 %files mod_heartbeat
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_heartbeat.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_heartbeat.conf
 %attr(755,root,root) %{_libexecdir}/mod_heartbeat.so
 
 %files mod_heartmonitor
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_heartmonitor.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_heartmonitor.conf
 %attr(755,root,root) %{_libexecdir}/mod_heartmonitor.so
 
 %files mod_ident
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_ident.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_ident.conf
 %attr(755,root,root) %{_libexecdir}/mod_ident.so
 
 %files mod_imagemap
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_imagemap.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_imagemap.conf
 %attr(755,root,root) %{_libexecdir}/mod_imagemap.so
 
 %files mod_include
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_include.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_include.conf
 %attr(755,root,root) %{_libexecdir}/mod_include.so
 
 %files mod_info
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_info.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_info.conf
 %attr(755,root,root) %{_libexecdir}/mod_info.so
 
 %files mod_lbmethod_bybusyness
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_lbmethod_bybusyness.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_lbmethod_bybusyness.conf
 %attr(755,root,root) %{_libexecdir}/mod_lbmethod_bybusyness.so
 
 %files mod_lbmethod_byrequests
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_lbmethod_byrequests.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_lbmethod_byrequests.conf
 %attr(755,root,root) %{_libexecdir}/mod_lbmethod_byrequests.so
 
 %files mod_lbmethod_bytraffic
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_lbmethod_bytraffic.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_lbmethod_bytraffic.conf
 %attr(755,root,root) %{_libexecdir}/mod_lbmethod_bytraffic.so
 
 %files mod_lbmethod_heartbeat
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_lbmethod_heartbeat.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_lbmethod_heartbeat.conf
 %attr(755,root,root) %{_libexecdir}/mod_lbmethod_heartbeat.so
 
 %if %{with ldap}
 %files mod_ldap
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_ldap.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_ldap.conf
 %attr(755,root,root) %{_libexecdir}/mod_ldap.so
 %endif
 
 %files mod_log_config
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_log_config.so
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_log_config.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_log_config.conf
 
 %files mod_log_debug
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_log_debug.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_log_debug.conf
 %attr(755,root,root) %{_libexecdir}/mod_log_debug.so
 
 %files mod_log_forensic
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_log_forensic.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_log_forensic.conf
 %attr(755,root,root) %{_libexecdir}/mod_log_forensic.so
 
 %files mod_logio
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_logio.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_logio.conf
 %attr(755,root,root) %{_libexecdir}/mod_logio.so
 
 %files mod_lua
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_lua.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_lua.conf
 %attr(755,root,root) %{_libexecdir}/mod_lua.so
 
 %files mod_macro
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_macro.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_macro.conf
 %attr(755,root,root) %{_libexecdir}/mod_macro.so
 
 %files mod_mime
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_mime.so
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_mime.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_mime.conf
 
 %files mod_mime_magic
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_mime_magic.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_mime_magic.conf
 %attr(755,root,root) %{_libexecdir}/mod_mime_magic.so
 
 %files mod_negotiation
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_negotiation.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_languages.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_negotiation.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/languages.conf
 %attr(755,root,root) %{_libexecdir}/mod_negotiation.so
 
 %files mod_proxy
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/fcgistarter
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_proxy.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_proxy.conf
 %attr(755,root,root) %{_libexecdir}/mod_proxy_ajp.so
 %attr(755,root,root) %{_libexecdir}/mod_proxy_balancer.so
 %attr(755,root,root) %{_libexecdir}/mod_proxy_connect.so
@@ -3585,94 +3590,94 @@ fi
 
 %files mod_ratelimit
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_ratelimit.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_ratelimit.conf
 %attr(755,root,root) %{_libexecdir}/mod_ratelimit.so
 
 %files mod_reflector
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_reflector.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_reflector.conf
 %attr(755,root,root) %{_libexecdir}/mod_reflector.so
 
 %files mod_remoteip
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_remoteip.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_remoteip.conf
 %attr(755,root,root) %{_libexecdir}/mod_remoteip.so
 
 %files mod_reqtimeout
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_reqtimeout.so
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_reqtimeout.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_reqtimeout.conf
 
 %files mod_request
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_request.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_request.conf
 %attr(755,root,root) %{_libexecdir}/mod_request.so
 
 %files mod_rewrite
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/httxt2dbm
 %attr(755,root,root) %{_libexecdir}/mod_rewrite.so
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_rewrite.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_rewrite.conf
 %{_mandir}/man1/httxt2dbm.1*
 
 %files mod_sed
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_sed.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_sed.conf
 %attr(755,root,root) %{_libexecdir}/mod_sed.so
 
 %files mod_session
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_session.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_session.conf
 %attr(755,root,root) %{_libexecdir}/mod_session.so
 
 %files mod_session_cookie
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_session_cookie.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_session_cookie.conf
 %attr(755,root,root) %{_libexecdir}/mod_session_cookie.so
 
 %files mod_session_crypto
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_session_crypto.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_session_crypto.conf
 %attr(755,root,root) %{_libexecdir}/mod_session_crypto.so
 
 %files mod_session_dbd
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_session_dbd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_session_dbd.conf
 %attr(755,root,root) %{_libexecdir}/mod_session_dbd.so
 
 %files mod_setenvif
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_setenvif.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_setenvif.conf
 %attr(755,root,root) %{_libexecdir}/mod_setenvif.so
 
 %files mod_slotmem_plain
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_slotmem_plain.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_slotmem_plain.conf
 %attr(755,root,root) %{_libexecdir}/mod_slotmem_plain.so
 
 %files mod_slotmem_shm
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_slotmem_shm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_slotmem_shm.conf
 %attr(755,root,root) %{_libexecdir}/mod_slotmem_shm.so
 
 %files mod_socache_dbm
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_socache_dbm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_socache_dbm.conf
 %attr(755,root,root) %{_libexecdir}/mod_socache_dbm.so
 
 %files mod_socache_memcache
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_socache_memcache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_socache_memcache.conf
 %attr(755,root,root) %{_libexecdir}/mod_socache_memcache.so
 
 %files mod_socache_shmcb
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_socache_shmcb.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_socache_shmcb.conf
 %attr(755,root,root) %{_libexecdir}/mod_socache_shmcb.so
 
 %files mod_speling
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_speling.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_speling.conf
 %attr(755,root,root) %{_libexecdir}/mod_speling.so
 
 %if %{with ssl}
@@ -3680,53 +3685,53 @@ fi
 %defattr(644,root,root,755)
 %attr(750,root,root) %dir %{_sysconfdir}/ssl
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ssl/server.*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_ssl.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_ssl.conf
 %attr(755,root,root) %{_libexecdir}/mod_ssl.so
 %endif
 
 %files mod_status
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_status.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_status.conf
 %attr(755,root,root) %{_libexecdir}/mod_status.so
 
 %files mod_substitute
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_substitute.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_substitute.conf
 %attr(755,root,root) %{_libexecdir}/mod_substitute.so
 
 %files mod_unique_id
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_unique_id.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_unique_id.conf
 %attr(755,root,root) %{_libexecdir}/mod_unique_id.so
 
 %files mod_userdir
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_userdir.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_userdir.conf
 %attr(755,root,root) %{_libexecdir}/mod_userdir.so
 
 %files mod_usertrack
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_usertrack.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_usertrack.conf
 %attr(755,root,root) %{_libexecdir}/mod_usertrack.so
 
 %files mod_version
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_version.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_version.conf
 %attr(755,root,root) %{_libexecdir}/mod_version.so
 
 %files mod_vhost_alias
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_vhost_alias.conf
 %attr(755,root,root) %{_libexecdir}/mod_vhost_alias.so
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_vhost_alias.conf
 
 %files mod_watchdog
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_watchdog.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_watchdog.conf
 %attr(755,root,root) %{_libexecdir}/mod_watchdog.so
 
 %files mod_xml2enc
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_xml2enc.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_xml2enc.conf
 %attr(755,root,root) %{_libexecdir}/mod_xml2enc.so
 
 %files -n htpasswd-%{name}
@@ -3746,4 +3751,4 @@ fi
 %defattr(644,root,root,755)
 %dir %{_cgibindir}
 %attr(755,root,root) %{_cgibindir}/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_cgi_test.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/cgi_test.conf
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/a310d9961edb669ed8e5898368a88f47e282311b




More information about the pld-cvs-commit mailing list