Skip to content
This repository has been archived by the owner on Sep 23, 2024. It is now read-only.

Commit

Permalink
Enable mod_brotli
Browse files Browse the repository at this point in the history
resolves #27
  • Loading branch information
carlwgeorge committed Jun 13, 2019
1 parent 64dfec7 commit 1bf4531
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
1 change: 1 addition & 0 deletions 00-base.conf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_owner_module modules/mod_authz_owner.so
LoadModule authz_user_module modules/mod_authz_user.so
LoadModule autoindex_module modules/mod_autoindex.so
LoadModule brotli_module modules/mod_brotli.so
LoadModule cache_module modules/mod_cache.so
LoadModule cache_disk_module modules/mod_cache_disk.so
LoadModule cache_socache_module modules/mod_cache_socache.so
Expand Down
18 changes: 17 additions & 1 deletion httpd24u.spec
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@

%if 0%{?rhel} >= 7
%bcond_without systemd
%bcond_without brotli
%else
%bcond_with systemd
%bcond_with brotli
%endif

# Drop automatic provides for module DSOs
Expand All @@ -23,7 +25,7 @@
Summary: Apache HTTP Server
Name: httpd24u
Version: 2.4.39
Release: 1%{?dist}
Release: 2%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source2: httpd.logrotate
Expand Down Expand Up @@ -90,6 +92,9 @@ License: ASL 2.0
Group: System Environment/Daemons
BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto
BuildRequires: zlib-devel, libselinux-devel, lua-devel
%if %{with brotli}
BuildRequires: brotli-devel
%endif
BuildRequires: %{apr}-devel >= 1.5.0, %{apr}-util-devel >= 1.5.0, pcre-devel >= 5.0
BuildRequires: libnghttp2-devel
%{?with_systemd:BuildRequires: systemd-devel}
Expand Down Expand Up @@ -354,6 +359,9 @@ export LYNX_PATH=/usr/bin/links
--with-suexec-syslog \
--with-suexec-bin=%{_sbindir}/suexec \
--with-suexec-uidmin=500 --with-suexec-gidmin=100 \
%if %{with brotli}
--with-brotli \
%endif
--enable-pie \
--with-pcre \
--enable-mods-shared=all \
Expand Down Expand Up @@ -402,6 +410,11 @@ for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
done

# remove brotli module config if disabled
%if %{without brotli}
sed -e '/brotli_module/d' -i $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-base.conf
%endif

%if %{with systemd}
# install systemd override drop directory
# Web application packages can drop snippets into this location if
Expand Down Expand Up @@ -813,6 +826,9 @@ exit $rv


%changelog
* Thu Jun 13 2019 Carl George <[email protected]> - 2.4.39-2
- Enable mod_brotli

* Tue Apr 02 2019 Carl George <[email protected]> - 2.4.39-1.ius
- Latest upstream

Expand Down

0 comments on commit 1bf4531

Please sign in to comment.