Accepting request 500571 from Apache

- server-tunning.conf: MaxClients was renamed to MaxRequestWorkers
  [bsc#1037731]
- gensslcert: use hostname when fqdn is too long [bsc#1035829]

- remove apache-doc and apache-example-pages obsoletes/provides

OBS-URL: https://build.opensuse.org/request/show/500571
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=133

apache2-server-tuning.conf

@@ -18,12 +18,12 @@
 	# maximum number of server processes which are kept spare
 	# http://httpd.apache.org/docs/2.4/mod/prefork.html#maxspareservers
 	MaxSpareServers     10
-	# highest possible MaxClients setting for the lifetime of the Apache process.
+	# highest possible MaxRequestWorkers setting for the lifetime of the Apache process.
 	# http://httpd.apache.org/docs/2.4/mod/mpm_common.html#serverlimit
 	ServerLimit        150
-	# maximum number of server processes allowed to start
+	# maximum number of server processes allowed to start (formerly MaxClients)
-	# http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxclients
+	# http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestworkers
-	MaxClients         150
+	MaxRequestWorkers         150
 	# maximum number of requests a server process serves
 	# http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestsperchild
 	MaxRequestsPerChild  10000
@@ -43,9 +43,9 @@
 	# upper limit on the configurable number of threads per child process
 	# http://httpd.apache.org/docs/2.4/mod/mpm_common.html#threadlimit
 	ThreadLimit         64
-	# maximum number of simultaneous client connections
+	# maximum number of simultaneous client connections (formerly MaxClients)
-	# http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxclients
+	# http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestworkers
-	MaxClients         150
+	MaxRequestWorkers         150
 	# number of worker threads created by each child process
 	# http://httpd.apache.org/docs/2.4/mod/mpm_common.html#threadsperchild
 	ThreadsPerChild     25
@@ -54,23 +54,6 @@
 	MaxRequestsPerChild  10000
 </IfModule>
 
-# leader MPM
-<IfModule leader.c>
-	# initial number of server processes to start
-	StartServers         2
-	# minimum number of worker threads which are kept spare
-	MinSpareThreads     25
-	# maximum number of worker threads which are kept spare
-	MaxSpareThreads     75 
-	# maximum number of simultaneous client connections
-	MaxClients         150
-	# constant number of worker threads in each server process
-	ThreadsPerChild     25
-	# maximum number of requests a server process serves
-	MaxRequestsPerChild  10000
-</IfModule>
-
-
 #
 # KeepAlive: Whether or not to allow persistent connections (more than
 # one request per connection). Set to "Off" to deactivate.

apache2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jun  2 07:36:43 UTC 2017 - pgajdos@suse.com
+
+- server-tunning.conf: MaxClients was renamed to MaxRequestWorkers
+  [bsc#1037731]
+- gensslcert: use hostname when fqdn is too long [bsc#1035829]
+
+-------------------------------------------------------------------
+Fri May 19 09:01:33 UTC 2017 - pgajdos@suse.com
+
+- remove apache-doc and apache-example-pages obsoletes/provides
+
 -------------------------------------------------------------------
 Thu Mar 16 18:59:58 UTC 2017 - kukuk@suse.com
 

apache2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache2
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -282,9 +282,6 @@ for development using the Apache API.
 %package doc
 Summary:        Additional Package Documentation
 Group:          Documentation/Other
-# Remove after 13.2 is out of support scope
-Provides:       apache-doc = %{version}
-Obsoletes:      apache-doc < %{version}
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
@@ -296,9 +293,6 @@ this package's base documentation.
 %package example-pages
 Summary:        Example Pages for the Apache 2 Web Server
 Group:          Productivity/Networking/Web/Servers
-# Remove after 13.2 is out of support scope
-Provides:       apache-example-pages
-Obsoletes:      apache-example-pages
 
 %description example-pages
 Some Example pages for Apache that show information about the installed

gensslcert

@@ -42,6 +42,11 @@ r=$ROOT
 . $r/etc/sysconfig/network/config
 FQHOSTNAME=`hostname -f`
 
+fqlength=`echo $FQHOSTNAME|wc -c`
+if [ $fqlength -gt 63 ]; then
+       FQHOSTNAME=`hostname`
+fi
+
 # defaults
   comment="mod_ssl server certificate"
      name=