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

Commit 1bf4531

Browse files
committed
Enable mod_brotli
resolves #27
1 parent 64dfec7 commit 1bf4531

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

00-base.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ LoadModule authz_host_module modules/mod_authz_host.so
2323
LoadModule authz_owner_module modules/mod_authz_owner.so
2424
LoadModule authz_user_module modules/mod_authz_user.so
2525
LoadModule autoindex_module modules/mod_autoindex.so
26+
LoadModule brotli_module modules/mod_brotli.so
2627
LoadModule cache_module modules/mod_cache.so
2728
LoadModule cache_disk_module modules/mod_cache_disk.so
2829
LoadModule cache_socache_module modules/mod_cache_socache.so

httpd24u.spec

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212

1313
%if 0%{?rhel} >= 7
1414
%bcond_without systemd
15+
%bcond_without brotli
1516
%else
1617
%bcond_with systemd
18+
%bcond_with brotli
1719
%endif
1820

1921
# Drop automatic provides for module DSOs
@@ -23,7 +25,7 @@
2325
Summary: Apache HTTP Server
2426
Name: httpd24u
2527
Version: 2.4.39
26-
Release: 1%{?dist}
28+
Release: 2%{?dist}
2729
URL: https://httpd.apache.org/
2830
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
2931
Source2: httpd.logrotate
@@ -90,6 +92,9 @@ License: ASL 2.0
9092
Group: System Environment/Daemons
9193
BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto
9294
BuildRequires: zlib-devel, libselinux-devel, lua-devel
95+
%if %{with brotli}
96+
BuildRequires: brotli-devel
97+
%endif
9398
BuildRequires: %{apr}-devel >= 1.5.0, %{apr}-util-devel >= 1.5.0, pcre-devel >= 5.0
9499
BuildRequires: libnghttp2-devel
95100
%{?with_systemd:BuildRequires: systemd-devel}
@@ -354,6 +359,9 @@ export LYNX_PATH=/usr/bin/links
354359
--with-suexec-syslog \
355360
--with-suexec-bin=%{_sbindir}/suexec \
356361
--with-suexec-uidmin=500 --with-suexec-gidmin=100 \
362+
%if %{with brotli}
363+
--with-brotli \
364+
%endif
357365
--enable-pie \
358366
--with-pcre \
359367
--enable-mods-shared=all \
@@ -402,6 +410,11 @@ for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
402410
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
403411
done
404412

413+
# remove brotli module config if disabled
414+
%if %{without brotli}
415+
sed -e '/brotli_module/d' -i $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-base.conf
416+
%endif
417+
405418
%if %{with systemd}
406419
# install systemd override drop directory
407420
# Web application packages can drop snippets into this location if
@@ -813,6 +826,9 @@ exit $rv
813826

814827

815828
%changelog
829+
* Thu Jun 13 2019 Carl George <[email protected]> - 2.4.39-2
830+
- Enable mod_brotli
831+
816832
* Tue Apr 02 2019 Carl George <[email protected]> - 2.4.39-1.ius
817833
- Latest upstream
818834

0 commit comments

Comments
 (0)