Update mods-* files for new apache2 server

diff --git a/mods-available/authz_svn.load b/mods-available/authz_svn.load
deleted file mode 100644 (file)
index c6df273..0000000
--- a/mods-available/authz_svn.load
+++ /dev/null
@@ -1,5 +0,0 @@
-# Depends: dav_svn
-<IfModule !mod_dav_svn.c>
-    Include mods-enabled/dav_svn.load
-</IfModule>
-LoadModule authz_svn_module /usr/lib/apache2/modules/mod_authz_svn.so

diff --git a/mods-available/brotli.load b/mods-available/brotli.load
new file mode 100644 (file)
index 0000000..ebd48ed
--- /dev/null
+++ b/mods-available/brotli.load
@@ -0,0 +1 @@
+LoadModule brotli_module /usr/lib/apache2/modules/mod_brotli.so

diff --git a/mods-available/dav_svn.conf b/mods-available/dav_svn.conf
deleted file mode 100644 (file)
index 8588917..0000000
--- a/mods-available/dav_svn.conf
+++ /dev/null
@@ -1,247 +0,0 @@
-#<IfDefine SVN>
-       <IfModule !mod_dav_svn.c>
-               LoadModule dav_svn_module       modules/mod_dav_svn.so
-       </IfModule>
-       
-       #<IfDefine SVN_AUTHZ>
-               <IfModule !mod_authz_svn.c>
-                       LoadModule authz_svn_module     modules/mod_authz_svn.so
-               </IfModule>
-               <IfModule !mod_auth_digest.c>
-                       LoadModule auth_digest_module   modules/mod_auth_digest.so
-               </IfModule>
-       #</IfDefine>
-
-       <Location /svn/repos>
-               DAV svn
-               SVNPath /var/svn/repos
-               AuthType Basic
-               AuthName "Subversion repository"
-               AuthUserFile /var/svn/conf/svnusers
-               Require valid-user
-       </Location>
-       
-       <Location /svn/multi-repos>
-               DAV svn
-               SVNParentPath /var/svn/multi-repos
-               AuthType Basic
-               AuthName "SVN Repository"
-               AuthUserFile /var/svn/conf/svnusers
-               Require valid-user
-       </LOCATION>
-
-       # Alex's subversion repositories
-       <Location /svn/alex/website>
-               DAV svn
-               SVNPath /var/svn/alex/website
-               AuthType Basic
-               AuthName "alex's subversion repositories"
-               AuthUserFile /var/svn/conf/svnusers
-               AuthGroupFile /var/svn/conf/svngroups
-#              AuthUserFile /var/svn/conf/svndigest
-#              AuthGroupFile /var/svn/conf/svngroups
-
-               Require valid-user
-
-               # Access control
-               AuthzSVNAccessFile /var/svn/conf/authz.conf
-
-#              <Limit GET PROPFIND OPTIONS REPORT>
-#                      Require group website-access
-#              </Limit>
-       </Location>
-       
-       <Location /svn/alex/transfer>
-               # DAV/svn directives
-               DAV svn
-               SVNPath /var/svn/alex/transfer
-               SVNAutoversioning on
-
-               # Authorization directives
-               AuthType Digest
-               AuthName "alex's subversion repositories"
-               AuthUserFile /var/svn/conf/svndigest
-               AuthGroupFile /var/svn/conf/svngroups
-               Require group valid-alex
-       </Location>
-
-       <Location /svn/alex/program>
-               # DAV/svn directives
-               DAV svn
-               SVNPath /var/svn/alex/program
-
-               # Authorization directives
-               AuthType Digest
-               AuthName "alex's subversion repositories"
-               AuthUserFile /var/svn/conf/svndigest
-               AuthGroupFile /var/svn/conf/svngroups
-
-               Require valid-user
-
-               # Access control
-               AuthzSVNAccessFile /var/svn/conf/authz.conf
-       </Location>
-
-       # Erik Krasner-Karpen and Evan's shareware games repository
-       <Location /svn/sisugames>
-               DAV svn
-               SVNPath /var/svn/sisugames
-
-               # Authorization directives
-               AuthType Digest
-               AuthName "sisugames subversion repository"
-               AuthUserFile /var/svn/conf/svndigest
-               AuthGroupFile /var/svn/conf/svngroups
-
-               Require valid-user
-
-               # Access control
-               AuthzSVNAccessFile /var/svn/conf/authz.conf
-       </Location>
-       
-       # Mathcamp yearbook repository
-       <Location /svn/mathcamp>
-               DAV svn
-               SVNPath /var/svn/mathcamp
-
-               # Authorization directives
-               AuthType Digest
-               AuthName "mathcamp"
-               AuthUserFile /var/svn/conf/svndigest
-               AuthGroupFile /var/svn/conf/svngroups
-
-               Require valid-user
-
-               # Access control
-               AuthzSVNAccessFile /var/svn/conf/authz.conf
-       </Location>
-
-       # Phillipian repository
-       <Location /svn/phillipian>
-               DAV svn
-               SVNPath /var/svn/phillipian
-
-               # Authorization directives
-               AuthType Digest
-               AuthName "SVN Repository"
-               AuthUserFile /var/svn/conf/svndigest
-               AuthGroupFile /var/svn/conf/svngroups
-
-               Require valid-user
-
-               # Access control
-               AuthzSVNAccessFile /var/svn/conf/authz.conf
-       </Location>
-
-       # Troop 57 repository
-       <Location /svn/troop57>
-               DAV svn
-               SVNPath /var/svn/troop57
-
-               # Authorization directives
-               AuthType Digest
-               AuthName "SVN Repository"
-               AuthUserFile /var/svn/conf/svndigest
-               AuthGroupFile /var/svn/conf/svngroups
-
-               Require valid-user
-
-               # Access control
-               AuthzSVNAccessFile /var/svn/conf/authz.conf
-       </Location>
-
-       # Monopoly
-       <Location /svn/monopoly>
-               DAV svn
-               SVNPath /var/svn/monopoly
-
-               # Authorization directives
-               AuthType Digest
-               AuthName "SVN Repository"
-               AuthUserFile /var/svn/conf/svndigest
-               AuthGroupFile /var/svn/conf/svngroups
-
-               Require valid-user
-
-               # Access control
-               AuthzSVNAccessFile /var/svn/conf/authz.conf
-       </Location>
-
-       # Crazed Capybara Cabal
-    # Battlecode 2009 team
-       <Location /svn/crazed-capybara-cabal>
-               DAV svn
-               SVNPath /var/svn/crazed-capybara-cabal
-
-               # Authorization directives
-               AuthType Digest
-               AuthName "SVN Repository"
-               AuthUserFile /var/svn/conf/svndigest
-               AuthGroupFile /var/svn/conf/svngroups
-
-               Require valid-user
-
-               # Access control
-               AuthzSVNAccessFile /var/svn/conf/authz.conf
-       </Location>
-
-    CustomLog /var/log/apache2/svn.log "%t %u %{SVN-ACTION}e" env=SVN-ACTION
-               
-#</IfDefine>
-
-# dav_svn.conf - Example Subversion/Apache configuration
-#
-# For details and further options see the Apache user manual and
-# the Subversion book.
-#
-# NOTE: for a setup with multiple vhosts, you will want to do this
-# configuration in /etc/apache2/sites-available/*, not here.
-
-# <Location URL> ... </Location>
-# URL controls how the repository appears to the outside world.
-# In this example clients access the repository as http://hostname/svn/
-# Note, a literal /svn should NOT exist in your document root.
-#<Location /svn>
-
-  # Uncomment this to enable the repository
-  #DAV svn
-
-  # Set this to the path to your repository
-  #SVNPath /var/lib/svn
-  # Alternatively, use SVNParentPath if you have multiple repositories under
-  # under a single directory (/var/lib/svn/repo1, /var/lib/svn/repo2, ...).
-  # You need either SVNPath and SVNParentPath, but not both.
-  #SVNParentPath /var/lib/svn
-
-  # Access control is done at 3 levels: (1) Apache authentication, via
-  # any of several methods.  A "Basic Auth" section is commented out
-  # below.  (2) Apache <Limit> and <LimitExcept>, also commented out
-  # below.  (3) mod_authz_svn is a svn-specific authorization module
-  # which offers fine-grained read/write access control for paths
-  # within a repository.  (The first two layers are coarse-grained; you
-  # can only enable/disable access to an entire repository.)  Note that
-  # mod_authz_svn is noticeably slower than the other two layers, so if
-  # you don't need the fine-grained control, don't configure it.
-
-  # Basic Authentication is repository-wide.  It is not secure unless
-  # you are using https.  See the 'htpasswd' command to create and
-  # manage the password file - and the documentation for the
-  # 'auth_basic' and 'authn_file' modules, which you will need for this
-  # (enable them with 'a2enmod').
-  #AuthType Basic
-  #AuthName "Subversion Repository"
-  #AuthUserFile /etc/apache2/dav_svn.passwd
-
-  # To enable authorization via mod_authz_svn (enable that module separately):
-  #<IfModule mod_authz_svn.c>
-  #AuthzSVNAccessFile /etc/apache2/dav_svn.authz
-  #</IfModule>
-
-  # The following three lines allow anonymous read, but make
-  # committers authenticate themselves.  It requires the 'authz_user'
-  # module (enable it with 'a2enmod').
-  #<LimitExcept GET PROPFIND OPTIONS REPORT>
-    #Require valid-user
-  #</LimitExcept> 
-
-#</Location>

diff --git a/mods-available/dav_svn.load b/mods-available/dav_svn.load
deleted file mode 100644 (file)
index e41e158..0000000
--- a/mods-available/dav_svn.load
+++ /dev/null
@@ -1,7 +0,0 @@
-# Depends: dav
-<IfModule !mod_dav_svn.c>
-    <IfModule !mod_dav.c>
-        Include mods-enabled/dav.load
-    </IfModule>
-    LoadModule dav_svn_module /usr/lib/apache2/modules/mod_dav_svn.so
-</IfModule>

diff --git a/mods-available/fcgid.conf b/mods-available/fcgid.conf
deleted file mode 100644 (file)
index ace956d..0000000
--- a/mods-available/fcgid.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<IfModule mod_fcgid.c>
-  FcgidConnectTimeout 20
-
-  <IfModule mod_mime.c>
-    AddHandler fcgid-script .fcgi
-  </IfModule>
-</IfModule>

diff --git a/mods-available/fcgid.load b/mods-available/fcgid.load
deleted file mode 100644 (file)
index 3c15f74..0000000
--- a/mods-available/fcgid.load
+++ /dev/null
@@ -1 +0,0 @@
-LoadModule fcgid_module /usr/lib/apache2/modules/mod_fcgid.so

diff --git a/mods-available/http2.conf b/mods-available/http2.conf
new file mode 100644 (file)
index 0000000..f45db4d
--- /dev/null
+++ b/mods-available/http2.conf
@@ -0,0 +1,34 @@
+
+# mod_http2 doesn't work with mpm_prefork
+<IfModule !mpm_prefork>
+    Protocols h2 h2c http/1.1
+
+    # # HTTP/2 push configuration
+    # 
+    # H2Push          on
+    # 
+    # # 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
+</IfModule>

diff --git a/mods-available/md.load b/mods-available/md.load
new file mode 100644 (file)
index 0000000..812a6a6
--- /dev/null
+++ b/mods-available/md.load
@@ -0,0 +1 @@
+LoadModule md_module /usr/lib/apache2/modules/mod_md.so

diff --git a/mods-available/php7.0.load b/mods-available/php7.0.load
deleted file mode 100644 (file)
index 55c2a49..0000000
--- a/mods-available/php7.0.load
+++ /dev/null
@@ -1,2 +0,0 @@
-# Conflicts: php5
-LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so

diff --git a/mods-available/php7.2.conf b/mods-available/php7.2.conf
deleted file mode 100644 (file)
index 5d7ff32..0000000
--- a/mods-available/php7.2.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-<FilesMatch ".+\.ph(ar|p|tml)$">
-    SetHandler application/x-httpd-php
-</FilesMatch>
-<FilesMatch ".+\.phps$">
-    SetHandler application/x-httpd-php-source
-    # Deny access to raw php sources by default
-    # To re-enable it's recommended to enable access to the files
-    # only in specific virtual host or directory
-    Require all denied
-</FilesMatch>
-# Deny access to files without filename (e.g. '.php')
-<FilesMatch "^\.ph(ar|p|ps|tml)$">
-    Require all denied
-</FilesMatch>
-
-# Running PHP scripts in user directories is disabled by default
-# 
-# To re-enable PHP in user directories comment the following lines
-# (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
-# prevents .htaccess files from disabling it.
-<IfModule mod_userdir.c>
-    <Directory /home/*/public_html>
-        #php_admin_flag engine Off
-    </Directory>
-</IfModule>

diff --git a/mods-available/php7.2.load b/mods-available/php7.2.load
deleted file mode 100644 (file)
index 0ff366e..0000000
--- a/mods-available/php7.2.load
+++ /dev/null
@@ -1,3 +0,0 @@
-# Conflicts: php5
-# Depends: mpm_prefork
-LoadModule php7_module /usr/lib/apache2/modules/libphp7.2.so

diff --git a/mods-available/php8.1.conf b/mods-available/php8.1.conf
new file mode 100644 (file)
index 0000000..d4df3e5
--- /dev/null
+++ b/mods-available/php8.1.conf
@@ -0,0 +1,25 @@
+<FilesMatch ".+\.ph(ar|p|tml)$">
+    SetHandler application/x-httpd-php
+</FilesMatch>
+<FilesMatch ".+\.phps$">
+    SetHandler application/x-httpd-php-source
+    # Deny access to raw php sources by default
+    # To re-enable it's recommended to enable access to the files
+    # only in specific virtual host or directory
+    Require all denied
+</FilesMatch>
+# Deny access to files without filename (e.g. '.php')
+<FilesMatch "^\.ph(ar|p|ps|tml)$">
+    Require all denied
+</FilesMatch>
+
+# Running PHP scripts in user directories is disabled by default
+# 
+# To re-enable PHP in user directories comment the following lines
+# (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
+# prevents .htaccess files from disabling it.
+<IfModule mod_userdir.c>
+    <Directory /home/*/public_html>
+        php_admin_flag engine Off
+    </Directory>
+</IfModule>

diff --git a/mods-available/php8.1.load b/mods-available/php8.1.load
new file mode 100644 (file)
index 0000000..9064719
--- /dev/null
+++ b/mods-available/php8.1.load
@@ -0,0 +1,3 @@
+# Conflicts: php5
+# Depends: mpm_prefork
+LoadModule php_module /usr/lib/apache2/modules/libphp8.1.so

diff --git a/mods-available/proxy_uwsgi.load b/mods-available/proxy_uwsgi.load
new file mode 100644 (file)
index 0000000..79ebd42
--- /dev/null
+++ b/mods-available/proxy_uwsgi.load
@@ -0,0 +1,2 @@
+# Depends: proxy
+LoadModule proxy_uwsgi_module /usr/lib/apache2/modules/mod_proxy_uwsgi.so

diff --git a/mods-available/socache_redis.load b/mods-available/socache_redis.load
new file mode 100644 (file)
index 0000000..b1a8de2
--- /dev/null
+++ b/mods-available/socache_redis.load
@@ -0,0 +1 @@
+LoadModule socache_redis_module /usr/lib/apache2/modules/mod_socache_redis.so

diff --git a/mods-enabled/authz_svn.load b/mods-enabled/authz_svn.load
deleted file mode 120000 (symlink)
index 7ac0725..0000000
--- a/mods-enabled/authz_svn.load
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/authz_svn.load
\ No newline at end of file

diff --git a/mods-enabled/dav_svn.conf b/mods-enabled/dav_svn.conf
deleted file mode 120000 (symlink)
index 964c7bb..0000000
--- a/mods-enabled/dav_svn.conf
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/dav_svn.conf
\ No newline at end of file

diff --git a/mods-enabled/dav_svn.load b/mods-enabled/dav_svn.load
deleted file mode 120000 (symlink)
index 4094e41..0000000
--- a/mods-enabled/dav_svn.load
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/dav_svn.load
\ No newline at end of file

diff --git a/mods-enabled/fcgid.conf b/mods-enabled/fcgid.conf
deleted file mode 120000 (symlink)
index d3fd236..0000000
--- a/mods-enabled/fcgid.conf
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/fcgid.conf
\ No newline at end of file

diff --git a/mods-enabled/fcgid.load b/mods-enabled/fcgid.load
deleted file mode 120000 (symlink)
index 9ea1b8e..0000000
--- a/mods-enabled/fcgid.load
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/fcgid.load
\ No newline at end of file

diff --git a/mods-enabled/php7.2.conf b/mods-enabled/php7.2.conf
deleted file mode 120000 (symlink)
index 8d6058a..0000000
--- a/mods-enabled/php7.2.conf
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/php7.2.conf
\ No newline at end of file

diff --git a/mods-enabled/php7.2.load b/mods-enabled/php7.2.load
deleted file mode 120000 (symlink)
index 66b235b..0000000
--- a/mods-enabled/php7.2.load
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/php7.2.load
\ No newline at end of file

diff --git a/mods-enabled/php8.1.conf b/mods-enabled/php8.1.conf
new file mode 120000 (symlink)
index 0000000..e8edb03
--- /dev/null
+++ b/mods-enabled/php8.1.conf
@@ -0,0 +1 @@
+../mods-available/php8.1.conf
\ No newline at end of file

diff --git a/mods-enabled/php8.1.load b/mods-enabled/php8.1.load
new file mode 120000 (symlink)
index 0000000..1e2ef5e
--- /dev/null
+++ b/mods-enabled/php8.1.load
@@ -0,0 +1 @@
+../mods-available/php8.1.load
\ No newline at end of file