[packages/apache] port misc changes from feat/conf-modules branch
glen
glen at pld-linux.org
Tue Apr 30 15:23:11 CEST 2019
commit 74b0772eb6eb345fa8414deb4a4d66856fedf8f3
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Tue Apr 30 15:59:44 2019 +0300
port misc changes from feat/conf-modules branch
apache-common.conf | 2 +-
apache-manual.conf | 3 +--
apache-mod_ssl.conf | 2 +-
apache.spec | 9 ++++-----
4 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index 8e72db3..371e021 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
@@ -2978,7 +2977,7 @@ rm -rf $RPM_BUILD_ROOT
%useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http
%pretrans base
-# handle $HTTPD_MPM from sysconfig
+# upgrade to 2.4: handle $HTTPD_MPM from sysconfig
if [ -f /etc/sysconfig/httpd ]; then
MPM=$(grep ^HTTPD_MPM /etc/sysconfig/httpd | sed 's,HTTPD_MPM=,,;s,",,g')
if [ -n "$MPM" ]; then
diff --git a/apache-common.conf b/apache-common.conf
index 085c5e7..714c05b 100644
--- a/apache-common.conf
+++ b/apache-common.conf
@@ -63,7 +63,7 @@ DocumentRoot "/home/services/httpd/html"
# doesn't give it to you.
#
# The Options directive is both complicated and important. Please see
- # http://httpd.apache.org/docs/2.2/mod/core.html#options
+ # https://httpd.apache.org/docs/2.4/mod/core.html#options
# for more information.
#
Options Indexes FollowSymLinks
diff --git a/apache-manual.conf b/apache-manual.conf
index 1ccd95f..a427941 100644
--- a/apache-manual.conf
+++ b/apache-manual.conf
@@ -1,8 +1,7 @@
-#
# Provide access to the documentation on your server as
# http://yourserver.example.com/manual/
# The documentation is always available at
-# http://httpd.apache.org/docs/2.2/
+# https://httpd.apache.org/docs/2.4/
#
# Required modules: mod_alias, mod_setenvif, mod_negotiation
# mod_setenvif, mod_negotiation
diff --git a/apache-mod_ssl.conf b/apache-mod_ssl.conf
index 7f0b259..f8d7e2c 100644
--- a/apache-mod_ssl.conf
+++ b/apache-mod_ssl.conf
@@ -3,7 +3,7 @@ LoadModule ssl_module modules/mod_ssl.so
# This is the Apache server configuration file providing SSL support.
# It contains the configuration directives to instruct the server how to
# serve pages over an https connection. For detailing information about these
-# directives see <URL:http://httpd.apache.org/docs/2.2/mod/mod_ssl.html>
+# directives see <https://httpd.apache.org/docs/2.4/mod/mod_ssl.html>
<IfModule mod_ssl.c>
#
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/89f93398347e91521825eb10c774a990ff654df3
More information about the pld-cvs-commit
mailing list