From ab631f02c6f5d2bedf11c3afc57f6390af12637c8f033977795b6a5462a96036 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 19 May 2017 09:02:02 +0000 Subject: [PATCH 1/4] - remove apache-doc obsoletes/provides OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=508 --- apache2.changes | 5 +++++ apache2.spec | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apache2.changes b/apache2.changes index ce5d85f..2cb4ed4 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 19 09:01:33 UTC 2017 - pgajdos@suse.com + +- remove apache-doc obsoletes/provides + ------------------------------------------------------------------- Thu Mar 16 18:59:58 UTC 2017 - kukuk@suse.com diff --git a/apache2.spec b/apache2.spec index be7afeb..c790c65 100644 --- a/apache2.spec +++ b/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 @@ -295,8 +292,8 @@ 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 +Group: Productivity/Networking/Web/Servers Provides: apache-example-pages Obsoletes: apache-example-pages From 30b44e65be7cd148fbc99250ef5b6445f52eedda5dc2a4f9d6185577274048ac Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 29 May 2017 07:27:41 +0000 Subject: [PATCH 2/4] - remove apache-doc and apache-example-pages obsoletes/provides OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=509 --- apache2.changes | 2 +- apache2.spec | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/apache2.changes b/apache2.changes index 2cb4ed4..9e773e1 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri May 19 09:01:33 UTC 2017 - pgajdos@suse.com -- remove apache-doc obsoletes/provides +- remove apache-doc and apache-example-pages obsoletes/provides ------------------------------------------------------------------- Thu Mar 16 18:59:58 UTC 2017 - kukuk@suse.com diff --git a/apache2.spec b/apache2.spec index c790c65..d73679d 100644 --- a/apache2.spec +++ b/apache2.spec @@ -292,10 +292,7 @@ this package's base documentation. %package example-pages Summary: Example Pages for the Apache 2 Web Server -# Remove after 13.2 is out of support scope Group: Productivity/Networking/Web/Servers -Provides: apache-example-pages -Obsoletes: apache-example-pages %description example-pages Some Example pages for Apache that show information about the installed From fdc17b9ba75d8924cbdd9595a85e57bb9ee37f303818e8c13669127161ffd14c Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 2 Jun 2017 07:45:40 +0000 Subject: [PATCH 3/4] - server-tunning.conf: MaxClients was renamed to MaxRequestWorkers [bsc#1037731] - gensslcert: use hostname when fqdn is too long [bsc#1035829] OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=510 --- apache2-server-tuning.conf | 18 +++++++++--------- apache2.changes | 7 +++++++ gensslcert | 5 +++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/apache2-server-tuning.conf b/apache2-server-tuning.conf index 493529e..9d74cde 100644 --- a/apache2-server-tuning.conf +++ b/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 - # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxclients - MaxClients 150 + # maximum number of server processes allowed to start (formerly MaxClients) + # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestworkers + 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 - # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxclients - MaxClients 150 + # maximum number of simultaneous client connections (formerly MaxClients) + # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestworkers + 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 @@ -62,8 +62,8 @@ MinSpareThreads 25 # maximum number of worker threads which are kept spare MaxSpareThreads 75 - # maximum number of simultaneous client connections - MaxClients 150 + # maximum number of simultaneous client connections (formerly MaxClients) + MaxRequestWorkers 150 # constant number of worker threads in each server process ThreadsPerChild 25 # maximum number of requests a server process serves diff --git a/apache2.changes b/apache2.changes index 9e773e1..2e237e8 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/gensslcert b/gensslcert index d73784b..a71bda9 100644 --- a/gensslcert +++ b/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= From e9058e73a14a3dc219e4a9fc4903b072a425563e14f21ae4a1b9ef39459d94fc Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 2 Jun 2017 09:27:56 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=511 --- apache2-server-tuning.conf | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/apache2-server-tuning.conf b/apache2-server-tuning.conf index 9d74cde..2eda2d3 100644 --- a/apache2-server-tuning.conf +++ b/apache2-server-tuning.conf @@ -54,23 +54,6 @@ MaxRequestsPerChild 10000 -# leader MPM - - # 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 (formerly MaxClients) - MaxRequestWorkers 150 - # constant number of worker threads in each server process - ThreadsPerChild 25 - # maximum number of requests a server process serves - MaxRequestsPerChild 10000 - - - # # KeepAlive: Whether or not to allow persistent connections (more than # one request per connection). Set to "Off" to deactivate.