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

Commit

Permalink
Fix pid file location on EL6
Browse files Browse the repository at this point in the history
resolves #19
  • Loading branch information
carlwgeorge committed Apr 18, 2018
1 parent deee235 commit c4862e0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 72 deletions.
33 changes: 0 additions & 33 deletions SOURCES/httpd-2.4.3-layout-legacy.patch

This file was deleted.

33 changes: 0 additions & 33 deletions SOURCES/httpd-2.4.3-layout.patch

This file was deleted.

12 changes: 12 additions & 0 deletions SOURCES/httpd-2.4.33-layout-legacy.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -Nurp httpd-2.4.33.orig/config.layout httpd-2.4.33/config.layout
--- httpd-2.4.33.orig/config.layout 2018-02-09 04:30:35.000000000 -0600
+++ httpd-2.4.33/config.layout 2018-04-18 09:22:51.903851417 -0500
@@ -149,7 +149,7 @@
cgidir: /var/www/cgi-bin
includedir: ${prefix}/include/httpd
localstatedir: /var
- runtimedir: /run/httpd
+ runtimedir: ${localstatedir}/run/httpd
logfiledir: ${localstatedir}/log/httpd
proxycachedir: ${localstatedir}/cache/httpd/proxy
</Layout>
12 changes: 6 additions & 6 deletions SPECS/httpd24u.spec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
Summary: Apache HTTP Server
Name: httpd24u
Version: 2.4.33
Release: 2.ius%{?dist}
Release: 3.ius%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source2: httpd.logrotate
Expand Down Expand Up @@ -67,8 +67,7 @@ Patch1: httpd-2.4.1-apctl.patch
Patch2: httpd-2.4.9-apxs.patch
Patch3: httpd-2.4.1-deplibs.patch
Patch6: httpd-2.4.3-apctl-systemd.patch
Patch7: httpd-2.4.3-layout.patch
Patch8: httpd-2.4.3-layout-legacy.patch
Patch8: httpd-2.4.33-layout-legacy.patch
# Needed for socket activation and mod_systemd patch
Patch19: httpd-2.4.25-detect-systemd.patch
# Features/functional changes
Expand Down Expand Up @@ -275,9 +274,7 @@ interface for storing and accessing per-user session data.
%patch3 -p1 -b .deplibs
%{?with_systemd:%patch6 -p1 -b .apctlsystemd}

%if 0%{?rhel} >= 7
%patch7 -p1 -b .layout
%else
%if 0%{?rhel} && 0%{?rhel} < 7
%patch8 -p1 -b .layout
%endif

Expand Down Expand Up @@ -810,6 +807,9 @@ exit $rv


%changelog
* Wed Apr 18 2018 Carl George <[email protected]> - 2.4.33-3.ius
- Fix pid file location on EL6

* Tue Apr 17 2018 Carl George <[email protected]> - 2.4.33-2.ius
- Restore systemd conditional to ship correct files

Expand Down

0 comments on commit c4862e0

Please sign in to comment.