[trafficserver] Create /var/run/trafficserver using tmpfiles.d on f15+, since /var/run is no tmpfs there and needs t

Jan-Frode Myklebust janfrode at fedoraproject.org
Fri Mar 23 20:14:13 UTC 2012


commit 8b7e02fb45fe38fb3a974a9173fab4e12151e6d5
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Fri Mar 23 21:13:30 2012 +0100

    Create /var/run/trafficserver using tmpfiles.d on f15+, since /var/run
    is no tmpfs there and needs to be recreated on every boot.

 trafficserver.spec      |   15 +++++++++++----
 trafficserver.tmpfilesd |    1 +
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/trafficserver.spec b/trafficserver.spec
index d682eb9..8f367af 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,12 +3,13 @@
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
 Version:	3.0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
 Source1:	trafficserver.sysconf
 Source2:	trafficserver.service
+Source3:	trafficserver.tmpfilesd
 URL:		http://trafficserver.apache.org/index.html
 # BuildRoot is only needed for EPEL5:
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -16,11 +17,11 @@ BuildRequires:	autoconf, automake, libtool, openssl-devel, tcl-devel, expat-deve
 BuildRequires:	pcre-devel, zlib-devel, xz-devel, gcc-c++
 # trafficserver fails to build on ppc, TS-1131
 ExcludeArch:	ppc ppc64
+Requires: initscripts
 %if %{?fedora}0 > 140 || %{?rhel}0 > 60
 Requires: systemd
 Requires(postun): systemd
 %else
-Requires: initscripts
 Requires(post): chkconfig
 Requires(preun): chkconfig initscripts
 Requires(postun): initscripts
@@ -33,7 +34,7 @@ Patch52:	trafficserver-condrestart.patch
 
 
 %description
-Apache Traffic Server is fast, scalable and extensible HTTP/1.1 compliant
+Apache Traffic Server is a fast, scalable and extensible HTTP/1.1 compliant
 caching proxy server.
 
 %prep
@@ -73,8 +74,10 @@ install -m 644 -p %{SOURCE1} \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/trafficserver
 
 %if %{?fedora}0 > 140 || %{?rhel}0 > 60
-install -D -m 644 -p %{SOURCE2} \
+install -D -m 0644 -p %{SOURCE2} \
    $RPM_BUILD_ROOT/lib/systemd/system/trafficserver.service
+install -D -m 0644 -p %{SOURCE3} \
+   $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/trafficserver.conf
 %else
 mkdir -p $RPM_BUILD_ROOT/etc/init.d/
 mv $RPM_BUILD_ROOT/usr/bin/trafficserver $RPM_BUILD_ROOT/etc/init.d
@@ -115,6 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/trafficserver/*
 %if %{?fedora}0 > 140 || %{?rhel}0 > 60
 %attr(0644, root, root) /lib/systemd/system/trafficserver.service
+%config(noreplace) %attr(0644, root, root) %{_sysconfdir}/tmpfiles.d/trafficserver.conf
 %else
 %attr(0755, root, root) /etc/init.d/trafficserver
 %endif
@@ -185,6 +189,9 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
+* Fri Mar 23 2012 <janfrode at tanso.net> - 3.0.4-2
+- Create /var/run/trafficserver using tmpfiles.d on f15+.
+
 * Thu Mar 22 2012 <janfrode at tanso.net> - 3.0.4-1
 - Update to new upstream release, v3.0.4.
 - remove trafficserver-cluster_interface_linux.patch since this was fixed upstream, TS-845.
diff --git a/trafficserver.tmpfilesd b/trafficserver.tmpfilesd
new file mode 100644
index 0000000..4e81322
--- /dev/null
+++ b/trafficserver.tmpfilesd
@@ -0,0 +1 @@
+d /var/run/trafficserver 0755 ats ats -


More information about the scm-commits mailing list