diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | httpd-init.service | 3 | ||||
| -rw-r--r-- | httpd.spec | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -28,3 +28,5 @@ x86_64 /httpd.service.8 /httpd-2.4.26.tar.bz2 /httpd-2.4.27.tar.bz2 +/httpd-*.tar.bz2 +/httpd*.8 diff --git a/httpd-init.service b/httpd-init.service index e2e8dd6..3074778 100644 --- a/httpd-init.service +++ b/httpd-init.service @@ -1,9 +1,8 @@ [Unit] -Description=One-time configuration for httpd.service +Description=One-time temporary TLS key generation for httpd.service Documentation=man:httpd-init.service(8) ConditionPathExists=|!/etc/pki/tls/certs/localhost.crt -ConditionPathExists=|!/etc/pki/tls/certs/localhost-ca.crt ConditionPathExists=|!/etc/pki/tls/private/localhost.key [Service] @@ -4,7 +4,7 @@ %define mmn 20120211 %define mmnisa %{mmn}%{__isa_name}%{__isa_bits} %define vstring %(source /etc/os-release; echo ${REDHAT_SUPPORT_PRODUCT}) -%if 0%{?fedora} < 27 +%if 0%{?fedora} < 27 || %{?rhel} <= 7 %global mpm prefork %else %global mpm event @@ -329,7 +329,7 @@ done sed -i '/^#LoadModule mpm_%{mpm}_module /s/^#//' \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf -touch -r $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf \ +touch -r $RPM_SOURCE_DIR/00-mpm.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf # install systemd override drop directory |