summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorJoe Orton <jorton@redhat.com>2017-09-21 16:41:20 +0100
committerJoe Orton <jorton@redhat.com>2017-09-21 16:41:20 +0100
commit6a777617406defe19df7a85b86427f1f3e0c3384 (patch)
tree2b3c8cca684589e4bdc62348346a4bad6dc40cd7 /httpd.spec
parent180ad320f452c4c58f6edc75a5749f665bf7459f (diff)
downloadhttpd-6a777617406defe19df7a85b86427f1f3e0c3384.tar.gz
httpd-6a777617406defe19df7a85b86427f1f3e0c3384.tar.xz
httpd-6a777617406defe19df7a85b86427f1f3e0c3384.zip
use sscg defaults; append CA cert to generated cert
document httpd-init.service in httpd-init.service(8)
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/httpd.spec b/httpd.spec
index 4073f37..efff2c5 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,7 +13,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.27
-Release: 8.4%{?dist}
+Release: 9%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -452,7 +452,7 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
$RPM_BUILD_ROOT/etc/logrotate.d/httpd
# Install systemd service man pages
-install -m 644 -p httpd.service.8 httpd.socket.8 \
+install -m 644 -p httpd.service.8 httpd-init.service.8 httpd.socket.8 \
$RPM_BUILD_ROOT%{_mandir}/man8
# fix man page paths
@@ -616,6 +616,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/proxy
%{_mandir}/man8/*
+%exclude %{_mandir}/man8/httpd-init.*
%{_unitdir}/httpd.service
%{_unitdir}/htcacheclean.service
@@ -656,6 +657,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libexecdir}/httpd-ssl-pass-dialog
%{_libexecdir}/httpd-ssl-gencerts
%{_unitdir}/httpd.socket.d/10-listen443.conf
+%{_mandir}/man8/httpd-init.*
%files -n mod_proxy_html
%defattr(-,root,root)
@@ -685,6 +687,10 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Thu Sep 21 2017 Joe Orton <jorton@redhat.com> - 2.4.27-9
+- use sscg defaults; append CA cert to generated cert
+- document httpd-init.service in httpd-init.service(8)
+
* Wed Sep 20 2017 Stephen Gallagher <sgallagh@redhat.com> - 2.4.27-8.1
- Generate SSL certificates on service start, not %posttrans