[httpd] Create drop directory for systemd snippets

jorton jorton at fedoraproject.org
Fri Feb 28 08:08:26 UTC 2014


commit 15ab7bceebbd996c486322fffabae830bc48417f
Author: Joe Orton <jorton at redhat.com>
Date:   Fri Feb 28 08:09:14 2014 +0000

    Create drop directory for systemd snippets

 httpd.spec |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/httpd.spec b/httpd.spec
index 7aa4785..dacfe2b 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -292,6 +292,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
 
+# install systemd override drop directory
+# Web application packages can drop snippets into this location if
+# they need ExecStart[pre|post].
+mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d
+
 for f in welcome.conf ssl.conf manual.conf userdir.conf; do
   install -m 644 -p $RPM_SOURCE_DIR/$f \
         $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
@@ -570,6 +575,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %{_unitdir}/*.service
+%attr(755,root,root) %dir %{_unitdir}/httpd.service.d
 
 %files tools
 %defattr(-,root,root)
@@ -620,6 +626,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Fri Feb 28 2014 Stephen Gallagher <sgallagh at redhat.com> 2.4.7-5
+- Create drop directory for systemd snippets
+
 * Thu Feb 27 2014 Jan Kaluza <jkaluza at redhat.com> - 2.4.7-4
 - remove provides of old MMN, because it contained double-dash (#1068851)
 


More information about the scm-commits mailing list