Changes - j0ke.net Open Build Service

Changes of Revision 6

[-] [+]	Changed	varnish.spec
@@ -32,6 +32,8 @@ URL: http://www.varnish-cache.org/ Source: http://downloads.sourceforge.net/varnish/varnish-%{pversion}.tar.bz2 Source2: varnish.init +Source3: varnish.service +Source4: varnishlog.service Patch0: varnish-redhat-pid.patch Patch2: varnish-sysconfig.patch Summary: Varnish is a high-performance HTTP accelerator @@ -110,6 +112,20 @@ %if 0%{?suse_version} %patch2 %endif +cat > redhat/varnish.sysconfig << EOF +VARNISHD_PARAMS="${DAEMON_OPTS}" +## Path: Network/WWW/Varnishd +## Description: Start parameters for varnishlog +## Type: string +## Default: "-a -w /var/log/varnish.log" +## Config: varnishd +# +# start parameters for varnishlog/varnishncsa +# +# see man 1 varnishlog for more +# +VARNISHLOG_PARAMS="-a -w /var/log/varnish/varnish.log" +EOF touch AUTHORS COPYING NEWS @@ -160,6 +176,13 @@ %endif %{__install} -m 0755 -d %{buildroot}%{_var}/run/%{name} %{__install} -m 0755 -d %{buildroot}/var/log/varnish + +%if 0%{?suse_version} >= 1210 \|\| 0%{?rhel} >= 7 +# systemd +%{__install} -m 0644 -D %{S:3} %{buildroot}/usr/lib/systemd/system/varnish.service +%{__install} -m 0644 -D %{S:4} %{buildroot}/usr/lib/systemd/system/varnishlog.service +%endif + rm -rf %{buildroot}/usr/share/doc/varnish %clean @@ -242,6 +265,10 @@ %dir %{_libdir}/varnish/vmods %{_libdir}/varnish/vmods/libvmod_std.so %{_libdir}/varnish/vmods/libvmod_directors.so +%if 0%{?suse_version} >= 1210 \|\| 0%{?rhel} >= 7 +/usr/lib/systemd/system/varnish.service +/usr/lib/systemd/system/varnishlog.service +%endif %files -n libvarnishapi1 %defattr(-,root,root,-)
[-] [+]	Added	varnish.service ^
@@ -0,0 +1,11 @@ +[Unit] +Description=Varnish HTTP accelerator/reverse proxy +After=network.target + +[Service] +EnvironmentFile=/etc/sysconfig/varnish +PIDFile=/var/run/varnishd.pid +ExecStart=/usr/sbin/varnishd $VARNISHD_PARAMS -P /var/run/varnishd.pid -F + +[Install] +WantedBy=multi-user.target
[-] [+]	Added	varnishlog.service ^
@@ -0,0 +1,12 @@ +[Unit] +Description=Varnish log generator +Requires=varnish.service +#After= is not required + +[Service] +EnvironmentFile=/etc/sysconfig/varnish +PIDFile=/var/run/varnishlog.pid +ExecStart=/usr/sbin/varnishncsa $VARNISHLOG_PARAMS -P /var/run/varnishlog.pid + +[Install] +WantedBy=multi-user.target