jengelh/varnish
SHA256
1
0
Fork 0
forked from pool/varnish
Code Pull Requests Activity

- Put %fillup back into %post

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=86
This commit is contained in:
Jan Engelhardt 2018-05-02 06:47:54 +00:00 committed by Git OBS Bridge
parent b8dc4c26ac
commit b54459f5c7
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
varnish.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 2 06:47:32 UTC 2018 - jengelh@inai.de
- Put %fillup back into %post
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 19 22:22:35 UTC 2018 - jengelh@inai.de Mon Mar 19 22:22:35 UTC 2018 - jengelh@inai.de

2
varnish.service
View File

@ -5,7 +5,7 @@ After=network.target
[Service] [Service]
EnvironmentFile=/etc/sysconfig/varnish EnvironmentFile=/etc/sysconfig/varnish
PIDFile=/var/run/varnishd.pid PIDFile=/var/run/varnishd.pid
ExecStart=/usr/sbin/varnishd $VARNISHD_PARAMS -P /var/run/varnishd.pid -F ExecStart=/usr/sbin/varnishd -P /var/run/varnishd.pid -F $VARNISHD_PARAMS
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

7
varnish.spec
View File

@ -120,7 +120,7 @@ install -dm 0755 "$b"/{%pkg_logdir,%pkg_home}
install -Dpm 0644 "%{S:5}" "$b/%_sysconfdir/logrotate.d/varnish" install -Dpm 0644 "%{S:5}" "$b/%_sysconfdir/logrotate.d/varnish"
# #
##init scripts ##init scripts
install -Dpm 0644 "%{S:3}" "$b%{_fillupdir}/sysconfig.%name" install -Dpm 0644 "%{S:3}" "$b/%_fillupdir/sysconfig.%name"
install -Dpm 0644 "%{S:7}" "$b/%_unitdir/varnish.service" install -Dpm 0644 "%{S:7}" "$b/%_unitdir/varnish.service"
install -Dpm 0644 "%{S:8}" "$b/%_unitdir/varnishlog.service" install -Dpm 0644 "%{S:8}" "$b/%_unitdir/varnishlog.service"
mkdir -p "$b/%_sbindir" mkdir -p "$b/%_sbindir"
@ -155,6 +155,7 @@ fi
%service_add_pre varnish.service varnishlog.service %service_add_pre varnish.service varnishlog.service
%post %post
%fillup_only
%service_add_post varnish.service varnishlog.service %service_add_post varnish.service varnishlog.service
%preun %preun
@ -181,7 +182,7 @@ fi
%dir %attr(0750,varnish,varnish) %pkg_home %dir %attr(0750,varnish,varnish) %pkg_home
%dir %attr(0750,varnish,varnish) %pkg_cachedir %dir %attr(0750,varnish,varnish) %pkg_cachedir
%dir %attr(0750,varnish,varnish) %pkg_logdir %dir %attr(0750,varnish,varnish) %pkg_logdir
%{_fillupdir}/sysconfig.%name %_fillupdir/sysconfig.%name
%files -n %library_name %files -n %library_name
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -189,7 +190,7 @@ fi
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%_includedir/varnish %_includedir/varnish/
%_datadir/aclocal/ %_datadir/aclocal/
%_libdir/pkgconfig/* %_libdir/pkgconfig/*
%_libdir/libvarnishapi.so %_libdir/libvarnishapi.so

2
varnishlog.service
View File

@ -6,7 +6,7 @@ Requires=varnish.service
[Service] [Service]
EnvironmentFile=/etc/sysconfig/varnish EnvironmentFile=/etc/sysconfig/varnish
PIDFile=/var/run/varnishlog.pid PIDFile=/var/run/varnishlog.pid
ExecStart=/usr/sbin/varnishncsa $VARNISHLOG_PARAMS -P /var/run/varnishlog.pid ExecStart=/usr/sbin/varnishncsa -P /var/run/varnishlog.pid $VARNISHLOG_PARAMS
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target