From e784a354b20318a5fd465de1ddc5a5630b98009d Mon Sep 17 00:00:00 2001 From: Alex Dehnert Date: Sat, 15 Jul 2023 02:24:39 +0000 Subject: [PATCH] Update mods-* files for new apache2 server --- mods-available/authz_svn.load | 5 - mods-available/brotli.load | 1 + mods-available/dav_svn.conf | 247 -------------------- mods-available/dav_svn.load | 7 - mods-available/fcgid.conf | 7 - mods-available/fcgid.load | 1 - mods-available/http2.conf | 34 +++ mods-available/md.load | 1 + mods-available/php7.0.load | 2 - mods-available/php7.2.load | 3 - mods-available/{php7.2.conf => php8.1.conf} | 2 +- mods-available/php8.1.load | 3 + mods-available/proxy_uwsgi.load | 2 + mods-available/socache_redis.load | 1 + mods-enabled/authz_svn.load | 1 - mods-enabled/dav_svn.conf | 1 - mods-enabled/dav_svn.load | 1 - mods-enabled/fcgid.conf | 1 - mods-enabled/fcgid.load | 1 - mods-enabled/php7.2.conf | 1 - mods-enabled/php7.2.load | 1 - mods-enabled/php8.1.conf | 1 + mods-enabled/php8.1.load | 1 + 23 files changed, 45 insertions(+), 280 deletions(-) delete mode 100644 mods-available/authz_svn.load create mode 100644 mods-available/brotli.load delete mode 100644 mods-available/dav_svn.conf delete mode 100644 mods-available/dav_svn.load delete mode 100644 mods-available/fcgid.conf delete mode 100644 mods-available/fcgid.load create mode 100644 mods-available/http2.conf create mode 100644 mods-available/md.load delete mode 100644 mods-available/php7.0.load delete mode 100644 mods-available/php7.2.load rename mods-available/{php7.2.conf => php8.1.conf} (95%) create mode 100644 mods-available/php8.1.load create mode 100644 mods-available/proxy_uwsgi.load create mode 100644 mods-available/socache_redis.load delete mode 120000 mods-enabled/authz_svn.load delete mode 120000 mods-enabled/dav_svn.conf delete mode 120000 mods-enabled/dav_svn.load delete mode 120000 mods-enabled/fcgid.conf delete mode 120000 mods-enabled/fcgid.load delete mode 120000 mods-enabled/php7.2.conf delete mode 120000 mods-enabled/php7.2.load create mode 120000 mods-enabled/php8.1.conf create mode 120000 mods-enabled/php8.1.load diff --git a/mods-available/authz_svn.load b/mods-available/authz_svn.load deleted file mode 100644 index c6df273..0000000 --- a/mods-available/authz_svn.load +++ /dev/null @@ -1,5 +0,0 @@ -# Depends: dav_svn - - Include mods-enabled/dav_svn.load - -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 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 index 8588917..0000000 --- a/mods-available/dav_svn.conf +++ /dev/null @@ -1,247 +0,0 @@ -# - - LoadModule dav_svn_module modules/mod_dav_svn.so - - - # - - LoadModule authz_svn_module modules/mod_authz_svn.so - - - LoadModule auth_digest_module modules/mod_auth_digest.so - - # - - - DAV svn - SVNPath /var/svn/repos - AuthType Basic - AuthName "Subversion repository" - AuthUserFile /var/svn/conf/svnusers - Require valid-user - - - - DAV svn - SVNParentPath /var/svn/multi-repos - AuthType Basic - AuthName "SVN Repository" - AuthUserFile /var/svn/conf/svnusers - Require valid-user - - - # Alex's subversion repositories - - 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 - -# -# Require group website-access -# - - - - # 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 - - - - # 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 - - - # Erik Krasner-Karpen and Evan's shareware games repository - - 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 - - - # Mathcamp yearbook repository - - 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 - - - # Phillipian repository - - 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 - - - # Troop 57 repository - - 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 - - - # 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 - - - # Crazed Capybara Cabal - # Battlecode 2009 team - - 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 - - - CustomLog /var/log/apache2/svn.log "%t %u %{SVN-ACTION}e" env=SVN-ACTION - -# - -# 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. - -# ... -# 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. -# - - # 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 and , 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): - # - #AuthzSVNAccessFile /etc/apache2/dav_svn.authz - # - - # The following three lines allow anonymous read, but make - # committers authenticate themselves. It requires the 'authz_user' - # module (enable it with 'a2enmod'). - # - #Require valid-user - # - -# diff --git a/mods-available/dav_svn.load b/mods-available/dav_svn.load deleted file mode 100644 index e41e158..0000000 --- a/mods-available/dav_svn.load +++ /dev/null @@ -1,7 +0,0 @@ -# Depends: dav - - - Include mods-enabled/dav.load - - LoadModule dav_svn_module /usr/lib/apache2/modules/mod_dav_svn.so - diff --git a/mods-available/fcgid.conf b/mods-available/fcgid.conf deleted file mode 100644 index ace956d..0000000 --- a/mods-available/fcgid.conf +++ /dev/null @@ -1,7 +0,0 @@ - - FcgidConnectTimeout 20 - - - AddHandler fcgid-script .fcgi - - diff --git a/mods-available/fcgid.load b/mods-available/fcgid.load deleted file mode 100644 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 index 0000000..f45db4d --- /dev/null +++ b/mods-available/http2.conf @@ -0,0 +1,34 @@ + +# mod_http2 doesn't work with 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 + # + # + # Header add Link "; rel=preload; as=style" + # Header add Link "; rel=preload; as=script" + # + # 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/mods-available/md.load b/mods-available/md.load new file mode 100644 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 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.load b/mods-available/php7.2.load deleted file mode 100644 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/php7.2.conf b/mods-available/php8.1.conf similarity index 95% rename from mods-available/php7.2.conf rename to mods-available/php8.1.conf index 5d7ff32..d4df3e5 100644 --- a/mods-available/php7.2.conf +++ b/mods-available/php8.1.conf @@ -20,6 +20,6 @@ # prevents .htaccess files from disabling it. - #php_admin_flag engine Off + php_admin_flag engine Off diff --git a/mods-available/php8.1.load b/mods-available/php8.1.load new file mode 100644 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 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 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 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 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 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 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 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 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 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 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 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 -- 2.34.1