JogAmp apache2 update (mpm_event, http2, php8)

10 files changed, 127 insertions, 19 deletions

diff --git a/server/setup/05-service-settings/etc/apache2/apache2.conf b/server/setup/05-service-settings/etc/apache2/apache2.conf
index 42afd0b..95384db 100644
--- a/server/setup/05-service-settings/etc/apache2/apache2.conf
+++ b/server/setup/05-service-settings/etc/apache2/apache2.conf
@@ -111,6 +111,7 @@ MaxKeepAliveRequests 100
 #KeepAliveTimeout 5
 KeepAliveTimeout 10
 
+ListenBackLog 5000
 
 # These need to be set in /etc/apache2/envvars
 User ${APACHE_RUN_USER}
diff --git a/server/setup/05-service-settings/etc/apache2/mods-available/fcgid.conf b/server/setup/05-service-settings/etc/apache2/mods-available/fcgid.conf
index cde267d..70b4454 100644
--- a/server/setup/05-service-settings/etc/apache2/mods-available/fcgid.conf
+++ b/server/setup/05-service-settings/etc/apache2/mods-available/fcgid.conf
@@ -6,4 +6,3 @@
     AddHandler fcgid-script .fcgi
   </IfModule>
 </IfModule>
-~               
diff --git a/server/setup/05-service-settings/etc/apache2/mods-available/http2.conf b/server/setup/05-service-settings/etc/apache2/mods-available/http2.conf
new file mode 100644
index 0000000..ebd7bbf
--- /dev/null
+++ b/server/setup/05-service-settings/etc/apache2/mods-available/http2.conf
@@ -0,0 +1,30 @@
+Protocols h2 h2c http/1.1
+
+# # HTTP/2 push configuration
+#
+H2Push          off
+#
+# # Default Priority Rule
+#
+# H2PushPriority * After 16
+#
+# # More complex ruleset:
+#
+# H2PushPriority  *                       after
+# H2PushPriority  text/css                before
+# H2PushPriority  image/jpeg              after   32
+# H2PushPriority  image/png               after   32
+# H2PushPriority  application/javascript  interleaved
+#
+# # Configure some stylesheet and script to be pushed by the webserver
+#
+# <FilesMatch "\.html$">
+#     Header add Link "</style.css>; rel=preload; as=style"
+#     Header add Link "</script.js>; rel=preload; as=script"
+# </FilesMatch>
+# Since mod_http2 doesn't support the mod_logio module (which provide the %O format),
+# you may want to change your LogFormat directive as follow:
+#
+# LogFormat "%v:%p %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+# LogFormat "%h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined
+# LogFormat "%h %l %u %t \"%r\" %>s %B" common
diff --git a/server/setup/05-service-settings/etc/apache2/mods-available/mpm_event.conf b/server/setup/05-service-settings/etc/apache2/mods-available/mpm_event.conf
new file mode 100644
index 0000000..b1f712f
--- /dev/null
+++ b/server/setup/05-service-settings/etc/apache2/mods-available/mpm_event.conf
@@ -0,0 +1,14 @@
+# event MPM
+# StartServers: initial number of server processes to start
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestWorkers: maximum number of worker threads
+# MaxConnectionsPerChild: maximum number of requests a server process serves
+StartServers            2
+MinSpareThreads         25
+MaxSpareThreads         75
+ThreadLimit             64
+ThreadsPerChild         25
+MaxRequestWorkers       150
+MaxConnectionsPerChild  0
diff --git a/server/setup/05-service-settings/etc/apache2/mods-enabled.lst b/server/setup/05-service-settings/etc/apache2/mods-enabled.lst
index c2df5c0..83fa40d 100644
--- a/server/setup/05-service-settings/etc/apache2/mods-enabled.lst
+++ b/server/setup/05-service-settings/etc/apache2/mods-enabled.lst
@@ -42,3 +42,63 @@ ssl.conf
 ssl.load
 status.conf
 status.load
+access_compat.load
+alias.conf
+alias.load
+auth_basic.load
+authn_core.load
+authn_file.load
+authz_core.load
+authz_groupfile.load
+authz_host.load
+authz_user.load
+autoindex.conf
+autoindex.load
+cgi.load
+cgid.conf
+cgid.load
+deflate.conf
+deflate.load
+dir.conf
+dir.load
+dnssd.conf
+dnssd.load
+env.load
+expires.load
+fcgid.conf
+fcgid.load
+filter.load
+headers.load
+http2.conf
+http2.load
+imagemap.load
+include.load
+mime.conf
+mime.load
+mpm_event.conf
+mpm_event.load
+negotiation.conf
+negotiation.load
+perl.load
+proxy.conf
+proxy.load
+proxy_ajp.load
+proxy_balancer.conf
+proxy_balancer.load
+proxy_connect.load
+proxy_ftp.conf
+proxy_ftp.load
+proxy_http.load
+proxy_scgi.load
+reqtimeout.conf
+reqtimeout.load
+rewrite.load
+setenvif.conf
+setenvif.load
+slotmem_shm.load
+socache_shmcb.load
+ssl.conf
+ssl.load
+status.conf
+status.load
+suexec.load
diff --git a/server/setup/05-service-settings/etc/apache2/ports.conf b/server/setup/05-service-settings/etc/apache2/ports.conf
index a319afa..f41641b 100644
--- a/server/setup/05-service-settings/etc/apache2/ports.conf
+++ b/server/setup/05-service-settings/etc/apache2/ports.conf
@@ -1,25 +1,13 @@
 # If you just change the port or add more ports here, you will likely also
 # have to change the VirtualHost statement in
-# /etc/apache2/sites-enabled/000-default
-# This is also true if you have upgraded from before 2.2.9-3 (i.e. from
-# Debian etch). See /usr/share/doc/apache2.2-common/NEWS.Debian.gz and
-# README.Debian.gz
+# /etc/apache2/sites-enabled/000-default.conf
 
-NameVirtualHost *:80
-# NameVirtualHost *
 Listen 80
 
-<IfModule mod_ssl.c>
-    NameVirtualHost *:443
-    # If you add NameVirtualHost *:443 here, you will also have to change
-    # the VirtualHost statement in /etc/apache2/sites-available/default-ssl
-    # to <VirtualHost *:443>
-    # Server Name Indication for SSL named virtual hosts is currently not
-    # supported by MSIE on Windows XP.
-    Listen 443
+<IfModule ssl_module>
+	Listen 443
 </IfModule>
 
 <IfModule mod_gnutls.c>
-    Listen 443
+	Listen 443
 </IfModule>
-
diff --git a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf
index 469f610..46582be 100644
--- a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf
+++ b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf
@@ -12,6 +12,8 @@ SSLStaplingCache shmcb:/var/run/apache2/stapling_cache(128000)
     RewriteEngine On
     DocumentRoot /srv/www/jogamp.org
 
+    Protocols h2 http/1.1
+
     UseCanonicalName Off
 
     # Guarantee HTTPS for 1 Year including Sub Domains
@@ -225,7 +227,7 @@ SSLStaplingCache shmcb:/var/run/apache2/stapling_cache(128000)
         AllowOverride All
         Require all granted
         AddHandler fcgid-script .php
-        FcgidWrapper /srv/www/scripts/php7-wrapper .php
+        FcgidWrapper /srv/www/scripts/php8-wrapper .php
     </Directory>
 
 	<Directory /srv/www/jogamp.org/bugzilla>
diff --git a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf
index 437016e..90ac67b 100644
--- a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf
+++ b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf
@@ -38,7 +38,7 @@
         AllowOverride All
         Require all granted
         AddHandler fcgid-script .php
-        FcgidWrapper /srv/www/scripts/php7-wrapper .php
+        FcgidWrapper /srv/www/scripts/php8-wrapper .php
     </Directory>
 
     #SetEnv GIT_PROJECT_ROOT /srv/scm
diff --git a/server/setup/05-service-settings/etc/apache2/suexec/webrunner b/server/setup/05-service-settings/etc/apache2/suexec/webrunner
new file mode 100644
index 0000000..3fd201f
--- /dev/null
+++ b/server/setup/05-service-settings/etc/apache2/suexec/webrunner
@@ -0,0 +1,7 @@
+/srv/www
+public_html/cgi-bin
+# The first two lines contain the suexec document root and the suexec userdir
+# suffix. If one of them is disabled by prepending a # character, suexec will
+# refuse the corresponding type of request.
+# This config file is only used by the apache2-suexec-custom package. See the
+# suexec man page included in the package for more details.
diff --git a/server/setup/05-service-settings/etc/apache2/suexec/www-data b/server/setup/05-service-settings/etc/apache2/suexec/www-data
new file mode 100644
index 0000000..3fd201f
--- /dev/null
+++ b/server/setup/05-service-settings/etc/apache2/suexec/www-data
@@ -0,0 +1,7 @@
+/srv/www
+public_html/cgi-bin
+# The first two lines contain the suexec document root and the suexec userdir
+# suffix. If one of them is disabled by prepending a # character, suexec will
+# refuse the corresponding type of request.
+# This config file is only used by the apache2-suexec-custom package. See the
+# suexec man page included in the package for more details.