[packages/apache/feat/conf-modules: 21/26] move loadmodule definitions in configs
glen
glen at pld-linux.org
Sat May 2 21:42:28 CEST 2015
commit 5d3e1083e1a24159694d818978b362b6c076afc6
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat May 2 15:55:43 2015 +0300
move loadmodule definitions in configs
apache-mod_authz_host.conf | 2 --
apache-mod_autoindex.conf | 2 --
apache-mod_cgid.conf | 2 --
apache-mod_deflate.conf | 7 ++++---
apache-mod_dir.conf | 2 --
apache-mod_info.conf | 2 --
apache-mod_log_config.conf | 2 --
apache-mod_mime.conf | 2 --
apache-mod_mime_magic.conf | 2 --
apache-mod_status.conf | 2 --
apache-mod_suexec.conf | 1 -
apache-mod_userdir.conf | 2 --
apache-mod_vhost_alias.conf | 2 --
apache.spec | 42 +++++++++++++++++++++++++++++-------------
14 files changed, 33 insertions(+), 39 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index aaa88ce..d2b03d7 100644
--- a/apache.spec
+++ b/apache.spec
@@ -1,11 +1,10 @@
# # TODO:
# - config examples for mod_*
# - --with-suexec-uidmin=500 or =1000 ?
-# - check those autn modules inner deps
+# - check those authn modules inner deps
# - for external packages: don't use any apache module name in dep as they
-# differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
-# - for mod_auth_* modules require each auth module to require virtual authn so at least *_core
-# is chosen?
+# differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
+# - for mod_auth_* modules require each auth module to require virtual authn so at least *_core is chosen?
# - same for mod_authz
# - mod_auth_digest and mod_auth_basic R: apache(authn) ?
# - drop mod_case_filter* or find summary and description for them
@@ -34,7 +33,7 @@ Summary(ru.UTF-8): Самый популярный веб-сервер
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
Version: 2.4.12
-Release: 3
+Release: 3.1
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -53,7 +52,6 @@ Source11: %{name}-mod_info.conf
Source12: %{name}-mod_ssl.conf
Source13: %{name}-mod_dav.conf
Source14: %{name}-mod_dir.conf
-Source15: %{name}-mod_suexec.conf
Source16: %{name}-mod_deflate.conf
Source17: %{name}-mod_autoindex.conf
Source18: %{name}-multilang-errordoc.conf
@@ -2799,7 +2797,6 @@ 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
@@ -2809,10 +2806,17 @@ cp -p %{SOURCE21} $CONFD/mpm.conf
cp -p %{SOURCE22} $CONFD/languages.conf
cp -p %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
+LoadModule() {
+ local index=$1 module=$2
+ echo "LoadModule ${module}_module modules/mod_$module.so" > $CONFD_MODULES/$index-mod_$module.conf
+}
+
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 \
authz_dbm authz_groupfile authz_owner authz_user buffer \
+ authz_host autoindex cgid deflate dir info log_config mime \
+ mime_magic status suexec userdir vhost_alias \
%{?with_bucketeer:bucketeer} \
case_filter_in case_filter cern_meta cgi charset_lite \
data dbd dialup dumpio \
@@ -2827,9 +2831,9 @@ for module in access_compat actions alias allowmethods asis auth_basic \
sed session_cookie session_crypto session_dbd session setenvif \
slotmem_plain slotmem_shm socache_dbm socache_memcache \
socache_shmcb speling substitute \
- unique_id usertrack version watchdog xml2enc; do
-
- echo "LoadModule ${module}_module modules/mod_$module.so" > $CONFD_MODULES/00_mod_$module.conf
+ unique_id usertrack version watchdog xml2enc \
+; do
+ LoadModule 00 $module
done
# anything in style dir not ending with .css is trash
@@ -3190,7 +3194,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.modules.d/*mod_suexec.conf
%{_mandir}/man8/suexec.8*
%files index
@@ -3327,6 +3331,7 @@ fi
%files mod_authz_host
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.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
@@ -3342,6 +3347,7 @@ fi
%files mod_autoindex
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.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
@@ -3388,6 +3394,7 @@ fi
%files mod_cgid
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.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
@@ -3414,6 +3421,7 @@ fi
%files mod_deflate
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.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
@@ -3424,6 +3432,7 @@ fi
%files mod_dir
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.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
@@ -3494,6 +3503,7 @@ fi
%files mod_info
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.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
@@ -3526,8 +3536,9 @@ fi
%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.modules.d/*mod_log_config.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_log_config.conf
+%attr(755,root,root) %{_libexecdir}/mod_log_config.so
%files mod_log_debug
%defattr(644,root,root,755)
@@ -3556,11 +3567,13 @@ fi
%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.modules.d/*mod_mime.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_mime.conf
+%attr(755,root,root) %{_libexecdir}/mod_mime.so
%files mod_mime_magic
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.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
@@ -3691,6 +3704,7 @@ fi
%files mod_status
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.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
@@ -3706,6 +3720,7 @@ fi
%files mod_userdir
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.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
@@ -3721,6 +3736,7 @@ fi
%files mod_vhost_alias
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_vhost_alias.conf
%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
diff --git a/apache-mod_authz_host.conf b/apache-mod_authz_host.conf
index 5391967..134948f 100644
--- a/apache-mod_authz_host.conf
+++ b/apache-mod_authz_host.conf
@@ -1,5 +1,3 @@
-LoadModule authz_host_module modules/mod_authz_host.so
-
# The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients.
#
diff --git a/apache-mod_autoindex.conf b/apache-mod_autoindex.conf
index b9c6ec1..143e0ce 100644
--- a/apache-mod_autoindex.conf
+++ b/apache-mod_autoindex.conf
@@ -1,5 +1,3 @@
-LoadModule autoindex_module modules/mod_autoindex.so
-
#
# Directives controlling the display of server-generated directory listings.
#
diff --git a/apache-mod_cgid.conf b/apache-mod_cgid.conf
index 25e25e9..2dae2ae 100644
--- a/apache-mod_cgid.conf
+++ b/apache-mod_cgid.conf
@@ -1,5 +1,3 @@
-LoadModule cgid_module modules/mod_cgid.so
-
<IfModule cgid_module>
#
# ScriptSock: On threaded servers, designate the path to the UNIX
diff --git a/apache-mod_deflate.conf b/apache-mod_deflate.conf
index 9428679..04c4910 100644
--- a/apache-mod_deflate.conf
+++ b/apache-mod_deflate.conf
@@ -1,6 +1,5 @@
-LoadModule deflate_module modules/mod_deflate.so
-
-# Safe but working settings - compress only that types:
+<IfModule mod_deflate.c>
+# Safe but working settings - compress only these types:
AddOutputFilterByType DEFLATE application/javascript application/x-javascript text/javascript
AddOutputFilterByType DEFLATE application/x-httpd-php
AddOutputFilterByType DEFLATE application/xhtml+xml
@@ -13,6 +12,8 @@ AddOutputFilterByType DEFLATE text/xml
# Compress all and exclude only few things - may cause some problems:
#SetOutputFilter DEFLATE
+</IfModule>
+
<IfModule mod_setenvif.c>
# Netscape 4.x has some problems...
BrowserMatch ^Mozilla/4 gzip-only-text/html
diff --git a/apache-mod_dir.conf b/apache-mod_dir.conf
index cea791f..8a40497 100644
--- a/apache-mod_dir.conf
+++ b/apache-mod_dir.conf
@@ -1,5 +1,3 @@
-LoadModule dir_module modules/mod_dir.so
-
# DirectoryIndex: sets the file that Apache will serve if a directory
# is requested.
diff --git a/apache-mod_info.conf b/apache-mod_info.conf
index 4dca480..ee93837 100644
--- a/apache-mod_info.conf
+++ b/apache-mod_info.conf
@@ -1,5 +1,3 @@
-LoadModule info_module modules/mod_info.so
-
# Get information about the requests being processed by the server
# and the configuration of the server.
#
diff --git a/apache-mod_log_config.conf b/apache-mod_log_config.conf
index 298a5d4..3e696c6 100644
--- a/apache-mod_log_config.conf
+++ b/apache-mod_log_config.conf
@@ -1,5 +1,3 @@
-LoadModule log_config_module modules/mod_log_config.so
-
<IfModule log_config_module>
#
# The following directives define some format nicknames for use with
diff --git a/apache-mod_mime.conf b/apache-mod_mime.conf
index f4f22e8..c0afaa2 100644
--- a/apache-mod_mime.conf
+++ b/apache-mod_mime.conf
@@ -1,5 +1,3 @@
-LoadModule mime_module modules/mod_mime.so
-
<IfModule mime_module>
#
# TypesConfig points to the file containing the list of mappings from
diff --git a/apache-mod_mime_magic.conf b/apache-mod_mime_magic.conf
index 0633dbb..fd1ae11 100644
--- a/apache-mod_mime_magic.conf
+++ b/apache-mod_mime_magic.conf
@@ -1,5 +1,3 @@
-LoadModule mime_magic_module modules/mod_mime_magic.so
-
# The mod_mime_magic module allows the server to use various hints from the
# contents of the file itself to determine its type. The MIMEMagicFile
# directive tells the module where the hint definitions are located.
diff --git a/apache-mod_status.conf b/apache-mod_status.conf
index 6477a23..2f0f06e 100644
--- a/apache-mod_status.conf
+++ b/apache-mod_status.conf
@@ -1,5 +1,3 @@
-LoadModule status_module modules/mod_status.so
-
#
# Get information about the requests being processed by the server
# and the configuration of the server.
diff --git a/apache-mod_suexec.conf b/apache-mod_suexec.conf
deleted file mode 100644
index bfc2c84..0000000
--- a/apache-mod_suexec.conf
+++ /dev/null
@@ -1 +0,0 @@
-LoadModule suexec_module modules/mod_suexec.so
diff --git a/apache-mod_userdir.conf b/apache-mod_userdir.conf
index 3b6fd29..65cdb4d 100644
--- a/apache-mod_userdir.conf
+++ b/apache-mod_userdir.conf
@@ -1,5 +1,3 @@
-LoadModule userdir_module modules/mod_userdir.so
-
# Settings for user home directories
#
# Required module: mod_userdir
diff --git a/apache-mod_vhost_alias.conf b/apache-mod_vhost_alias.conf
index b33826e..e13a56c 100644
--- a/apache-mod_vhost_alias.conf
+++ b/apache-mod_vhost_alias.conf
@@ -1,5 +1,3 @@
-LoadModule vhost_alias_module modules/mod_vhost_alias.so
-
<IfModule mod_vhost_alias.c>
# http://www.example.com/directory/file.html will be satisfied by the file
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/a310d9961edb669ed8e5898368a88f47e282311b
More information about the pld-cvs-commit
mailing list